svn commit: samba r8545 - in branches/SAMBA_3_0/source/smbd: .
jra at samba.org
jra at samba.org
Mon Jul 18 18:50:14 GMT 2005
Author: jra
Date: 2005-07-18 18:50:13 +0000 (Mon, 18 Jul 2005)
New Revision: 8545
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8545
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:
branches/SAMBA_3_0/source/smbd/oplock.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/oplock.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/oplock.c 2005-07-18 17:53:38 UTC (rev 8544)
+++ branches/SAMBA_3_0/source/smbd/oplock.c 2005-07-18 18:50:13 UTC (rev 8545)
@@ -461,12 +461,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