diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-06 09:07:49 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-06 09:07:49 -0700 |
| commit | 516f7c571e4499a3707505733941b396caad7edd (patch) | |
| tree | c99b20d5ddfe63a76033fec2b8933c702cee6740 | |
| parent | a77a8a5e351bf9aeaeda571d753775c8d2977184 (diff) | |
| download | samba-516f7c571e4499a3707505733941b396caad7edd.tar.gz samba-516f7c571e4499a3707505733941b396caad7edd.tar.bz2 samba-516f7c571e4499a3707505733941b396caad7edd.zip | |
Fix SMB2 lock tests up to cancel-by-close.
Jeremy.
| -rw-r--r-- | source3/locking/brlock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 8250e5a9d4..c46221731d 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 && |