diff options
| author | Jeremy Allison <jra@samba.org> | 2003-02-22 01:09:57 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-02-22 01:09:57 +0000 |
| commit | 285a3b0ef869382aea892cad37284ba9cbe529d2 (patch) | |
| tree | 9a78184e1cad3c664c44e1159acf863526b253ec | |
| parent | 01490bc0d254380f9bf3ab1f8dc3d98b8c0e723e (diff) | |
| download | samba-285a3b0ef869382aea892cad37284ba9cbe529d2.tar.gz samba-285a3b0ef869382aea892cad37284ba9cbe529d2.tar.bz2 samba-285a3b0ef869382aea892cad37284ba9cbe529d2.zip | |
When checking is_locked() new WRITE locks conflict with existing READ locks even
if the context is the same. See LOCKTEST7 in smbtorture.
Jeremy.
(This used to be commit 1698092ba5a169de369ad1182a6f270de174c3f5)
| -rw-r--r-- | source3/locking/brlock.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 8c22f7d7ab..9902c7bbd7 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -151,9 +151,16 @@ static BOOL brl_conflict_other(struct lock_struct *lck1, struct lock_struct *lck if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) return False; - if (brl_same_context(&lck1->context, &lck2->context) && - lck1->fnum == lck2->fnum) - return False; + /* + * Incoming WRITE locks conflict with existing READ locks even + * if the context is the same. JRA. See LOCKTEST7 in smbtorture. + */ + + if (!(lck2->lock_type == WRITE_LOCK && lck1->lock_type == READ_LOCK)) { + if (brl_same_context(&lck1->context, &lck2->context) && + lck1->fnum == lck2->fnum) + return False; + } if (lck1->start >= (lck2->start + lck2->size) || lck2->start >= (lck1->start + lck1->size)) return False; |