The branch, master has been updated
via 516f7c5... Fix SMB2 lock tests up to cancel-by-close.
from a77a8a5... Fix more SMB2 locking. We still crash but this won't
last :-).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 516f7c571e4499a3707505733941b396caad7edd
Author: Jeremy Allison <[email protected]>
Date: Thu May 6 09:07:49 2010 -0700
Fix SMB2 lock tests up to cancel-by-close.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/locking/brlock.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 8250e5a..c462217 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -997,6 +997,10 @@ bool brl_unlock_windows_default(struct messaging_context
*msg_ctx,
for (i = 0; i < br_lck->num_locks; i++) {
struct lock_struct *lock = &locks[i];
+ if (IS_PENDING_LOCK(lock->lock_type)) {
+ continue;
+ }
+
/* Only remove our own locks that match in start, size, and
flavour. */
if (brl_same_context(&lock->context, &plock->context) &&
lock->fnum == plock->fnum &&
--
Samba Shared Repository
