diff options
| author | Jeremy Allison <jra@samba.org> | 2003-04-04 20:38:12 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-04-04 20:38:12 +0000 |
| commit | 34226f1bd4d90ffe0f324277b11bbc4f2b575740 (patch) | |
| tree | a44e535e8b42a27ce10ea0219198f65e6d77a9c2 /source3/locking/brlock.c | |
| parent | 4127c455c8fd446ab952de37fabbd7d8ef20847a (diff) | |
| download | samba-34226f1bd4d90ffe0f324277b11bbc4f2b575740.tar.gz samba-34226f1bd4d90ffe0f324277b11bbc4f2b575740.tar.bz2 samba-34226f1bd4d90ffe0f324277b11bbc4f2b575740.zip | |
Fix for very subtle POSIX lock interaction race condition found by
Herb. We need to unlock POSIX locks before notifying pending lock
processes.
Jeremy.
(This used to be commit 6999eef51c3e597b3b2cd9cc26138acdfbb6a23a)
Diffstat (limited to 'source3/locking/brlock.c')
| -rw-r--r-- | source3/locking/brlock.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 4cd885f1a6..20d76c9c79 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -414,7 +414,9 @@ static BOOL brl_pending_overlap(struct lock_struct *lock, struct lock_struct *pe BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, - BOOL remove_pending_locks_only) + BOOL remove_pending_locks_only, + void (*pre_unlock_fn)(void *), + void *pre_unlock_data) { TDB_DATA kbuf, dbuf; int count, i, j; @@ -450,6 +452,10 @@ BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, lock->fnum == fnum && lock->start == start && lock->size == size) { + + if (pre_unlock_fn) + (*pre_unlock_fn)(pre_unlock_data); + /* found it - delete it */ if (count == 1) { tdb_delete(tdb, kbuf); @@ -483,6 +489,11 @@ BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, continue; if (lock->lock_type != PENDING_LOCK) { + + /* Do any POSIX unlocks needed. */ + if (pre_unlock_fn) + (*pre_unlock_fn)(pre_unlock_data); + /* Send unlock messages to any pending waiters that overlap. */ for (j=0; j<count; j++) { struct lock_struct *pend_lock = &locks[j]; |