Fix SMB2 lock tests up to cancel-by-close.
authorJeremy Allison <jra@samba.org>
Thu, 6 May 2010 16:07:49 +0000 (09:07 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 6 May 2010 16:07:49 +0000 (09:07 -0700)
Jeremy.

source3/locking/brlock.c

index 8250e5a9d4ceff81c55f72ea776bc4dea073d6a6..c46221731d3e369031bcb08b25448d0b71379d3a 100644 (file)
@@ -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 &&