svn commit: samba r8546 - in trunk/source/smbd: .

jra at samba.org jra at samba.org
Mon Jul 18 18:58:45 GMT 2005


Author: jra
Date: 2005-07-18 18:58:44 +0000 (Mon, 18 Jul 2005)
New Revision: 8546

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

Log:
Fix oplock bug introduced by oplock code "simplification" :-).
We *always* reply to an exclusive oplock break message even if
we have no record of the oplock (and we always did before 3.0.20pre2).
Jeremy.

Modified:
   trunk/source/smbd/oplock.c


Changeset:
Modified: trunk/source/smbd/oplock.c
===================================================================
--- trunk/source/smbd/oplock.c	2005-07-18 18:50:13 UTC (rev 8545)
+++ trunk/source/smbd/oplock.c	2005-07-18 18:58:44 UTC (rev 8546)
@@ -470,12 +470,12 @@
 		 */
 		DEBUG(3,("process_local_message: oplock break requested with "
 			 "no outstanding oplocks. Returning success.\n"));
-		return True;
-	}
 
-	if (!oplock_break(dev, inode, file_id, False)) {
-		DEBUG(0,("process_local_message: oplock break failed.\n"));
-		return False;
+	} else {
+		if (!oplock_break(dev, inode, file_id, False)) {
+			DEBUG(0,("process_local_message: oplock break failed.\n"));
+			return False;
+		}
 	}
 
 	/* 



More information about the samba-cvs mailing list