The branch, master has been updated
via 82fdad8 Trying to track down the SMB2 error. Add an invariant test.
from e49893c Use handle based xattr set if available.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 82fdad8a4c1e45d171a75b133eff8f9768edd682
Author: Jeremy Allison <[email protected]>
Date: Fri Apr 15 16:30:17 2011 -0700
Trying to track down the SMB2 error. Add an invariant test.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Sat Apr 16 02:15:38 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/locking/locking.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 28f1ace..f5892dd 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1376,12 +1376,15 @@ bool remove_share_oplock(struct share_mode_lock *lck,
files_struct *fsp)
return False;
}
- if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+ if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) {
/*
* Going from exclusive or batch,
* we always go through FAKE_LEVEL_II
* first.
*/
+ if (!EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+ smb_panic("remove_share_oplock: logic error");
+ }
e->op_type = FAKE_LEVEL_II_OPLOCK;
} else {
e->op_type = NO_OPLOCK;
--
Samba Shared Repository
