svn commit: samba r8524 - in trunk/source: locking smbd

[vlendec at samba.org]

Author: vlendec
Date: 2005-07-17 12:14:27 +0000 (Sun, 17 Jul 2005)
New Revision: 8524

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8524

Log:
lock/unlock_share_entry don't use the connection parameter, so delete it.

Volker

Modified:
   trunk/source/locking/locking.c
   trunk/source/smbd/open.c
   trunk/source/smbd/oplock.c


Changeset:
Modified: trunk/source/locking/locking.c
===================================================================
--- trunk/source/locking/locking.c	2005-07-17 10:52:31 UTC (rev 8523)
+++ trunk/source/locking/locking.c	2005-07-17 12:14:27 UTC (rev 8524)
@@ -394,8 +394,7 @@
  Lock a hash bucket entry.
 ******************************************************************/
 
-BOOL lock_share_entry(connection_struct *conn,
-		      SMB_DEV_T dev, SMB_INO_T inode)
+BOOL lock_share_entry(SMB_DEV_T dev, SMB_INO_T inode)
 {
 	return tdb_chainlock(tdb, locking_key(dev, inode)) == 0;
 }
@@ -404,8 +403,7 @@
  Unlock a hash bucket entry.
 ******************************************************************/
 
-void unlock_share_entry(connection_struct *conn,
-			SMB_DEV_T dev, SMB_INO_T inode)
+void unlock_share_entry(SMB_DEV_T dev, SMB_INO_T inode)
 {
 	tdb_chainunlock(tdb, locking_key(dev, inode));
 }

Modified: trunk/source/smbd/open.c
===================================================================
--- trunk/source/smbd/open.c	2005-07-17 10:52:31 UTC (rev 8523)
+++ trunk/source/smbd/open.c	2005-07-17 12:14:27 UTC (rev 8524)
@@ -645,12 +645,12 @@
 			srv_defer_sign_response(get_current_mid());
 
 			/* Oplock break - unlock to request it. */
-			unlock_share_entry(conn, dev, inode);
+			unlock_share_entry(dev, inode);
 				
 			opb_ret = request_oplock_break(share_entry);
 				
 			/* Now relock. */
-			lock_share_entry(conn, dev, inode);
+			lock_share_entry(dev, inode);
 				
 			if (!opb_ret) {
 				DEBUG(0,("open_mode_check: FAILED when breaking "
@@ -1262,10 +1262,10 @@
 			remove_sharing_violation_open_smb_message(mid);
 
 			/* Now remove the deferred open entry under lock. */
-			lock_share_entry(conn, dib.dev, dib.inode);
+			lock_share_entry(dib.dev, dib.inode);
 			delete_defered_open_entry_record(conn, dib.dev,
 							 dib.inode);
-			unlock_share_entry(conn, dib.dev, dib.inode);
+			unlock_share_entry(dib.dev, dib.inode);
 
 			set_saved_error_triple(ERRDOS, ERRbadshare,
 					       NT_STATUS_SHARING_VIOLATION);
@@ -1463,7 +1463,7 @@
 		dev = psbuf->st_dev;
 		inode = psbuf->st_ino;
 
-		lock_share_entry(conn, dev, inode);
+		lock_share_entry(dev, inode);
 
 		num_share_modes = open_mode_check(conn, fname, dev, inode,
 						  access_mask, share_access,
@@ -1488,7 +1488,7 @@
 									  create_options);
 
 						if (fsp_dup) {
-							unlock_share_entry(conn, dev, inode);
+							unlock_share_entry(dev, inode);
 							file_free(fsp);
 							if (pinfo) {
 								*pinfo = FILE_WAS_OPENED;
@@ -1548,7 +1548,7 @@
 				}
 			}
 
-			unlock_share_entry(conn, dev, inode);
+			unlock_share_entry(dev, inode);
 			if (fsp_open) {
 				fd_close(conn, fsp);
 				/*
@@ -1594,7 +1594,7 @@
 
 	if (!fsp_open) {
 		if(file_existed) {
-			unlock_share_entry(conn, dev, inode);
+			unlock_share_entry(dev, inode);
 		}
 		file_free(fsp);
 		return NULL;
@@ -1641,7 +1641,7 @@
 								  access_mask, share_access,
 								  create_options);
 					if (fsp_dup) {
-						unlock_share_entry(conn, dev, inode);
+						unlock_share_entry(dev, inode);
 						fd_close(conn, fsp);
 						file_free(fsp);
 						if (pinfo) {

Modified: trunk/source/smbd/oplock.c
===================================================================
--- trunk/source/smbd/oplock.c	2005-07-17 10:52:31 UTC (rev 8523)
+++ trunk/source/smbd/oplock.c	2005-07-17 12:14:27 UTC (rev 8524)
@@ -1285,7 +1285,7 @@
 		/* Paranoia .... */
 		if (EXCLUSIVE_OPLOCK_TYPE(share_entry->op_type)) {
 			DEBUG(0,("release_level_2_oplocks_on_change: PANIC. share mode entry %d is an exlusive oplock !\n", i ));
-			unlock_share_entry(fsp->conn, fsp->dev, fsp->inode);
+			unlock_share_entry(fsp->dev, fsp->inode);
 			abort();
 		}
 
@@ -1301,7 +1301,7 @@
 			/* Paranoia check... */
 			if(new_fsp == NULL) {
 				DEBUG(0,("release_level_2_oplocks_on_change: PANIC. share mode entry %d is not a local file !\n", i ));
-				unlock_share_entry(fsp->conn, fsp->dev, fsp->inode);
+				unlock_share_entry(fsp->dev, fsp->inode);
 				abort();
 			}