diff options
| author | Jeremy Allison <jra@samba.org> | 2003-04-04 20:38:25 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-04-04 20:38:25 +0000 |
| commit | db5f60098a9baa6685ff63d173ef94952f6c4f7a (patch) | |
| tree | a212a2cf64239b798befdeb8052cea71d0ab68d0 /source3/locking/brlock.c | |
| parent | f72611917fd0c80b66fa603c85e5e58e6acea973 (diff) | |
| download | samba-db5f60098a9baa6685ff63d173ef94952f6c4f7a.tar.gz samba-db5f60098a9baa6685ff63d173ef94952f6c4f7a.tar.xz samba-db5f60098a9baa6685ff63d173ef94952f6c4f7a.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 eb861e9d0fd79bbd9401ced8e55fe603c2aa7c1e)
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 4cd885f1a65..20d76c9c792 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]; |