From: Jeremy Allison <jra@samba.org>
Date: Thu, 6 May 2010 16:07:49 +0000 (-0700)
Subject: Fix SMB2 lock tests up to cancel-by-close.
X-Git-Tag: samba-3.6.0pre1~2191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=516f7c571e4499a3707505733941b396caad7edd;p=thirdparty%2Fsamba.git

Fix SMB2 lock tests up to cancel-by-close.

Jeremy.
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 8250e5a9d4c..c46221731d3 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 &&