svn commit: samba r15959 - in branches/SAMBA_3_0/source/smbd: .

jra at samba.org jra at samba.org
Tue May 30 18:26:50 GMT 2006


Author: jra
Date: 2006-05-30 18:26:49 +0000 (Tue, 30 May 2006)
New Revision: 15959

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

Log:
Ooops. Use the right file_free call...
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/open.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/open.c	2006-05-30 18:17:37 UTC (rev 15958)
+++ branches/SAMBA_3_0/source/smbd/open.c	2006-05-30 18:26:49 UTC (rev 15959)
@@ -1368,7 +1368,7 @@
 					fname);
 
 		if (lck == NULL) {
-			file_free_fsp(fsp);
+			file_free(fsp);
 			DEBUG(0, ("Could not get share mode lock\n"));
 			set_saved_ntstatus(NT_STATUS_SHARING_VIOLATION);
 			return NULL;
@@ -1378,7 +1378,7 @@
 		if (delay_for_oplocks(lck, fsp, 1, oplock_request)) {
 			schedule_defer_open(lck, request_time);
 			TALLOC_FREE(lck);
-			file_free_fsp(fsp);
+			file_free(fsp);
 			return NULL;
 		}
 
@@ -1392,7 +1392,7 @@
 			if (delay_for_oplocks(lck, fsp, 2, oplock_request)) {
 				schedule_defer_open(lck, request_time);
 				TALLOC_FREE(lck);
-				file_free_fsp(fsp);
+				file_free(fsp);
 				return NULL;
 			}
 		}



More information about the samba-cvs mailing list