summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-29 19:14:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:25 -0500
commit2c6030415e0b1f421ea6e85fe6ffe7389ee7a941 (patch)
tree3cd4c3c78862d48be0653db5e7c34314bf607e45 /source3/smbd
parent4e9df2fba37e4b1422bfda9781c7c486cfec7ed1 (diff)
downloadsamba-2c6030415e0b1f421ea6e85fe6ffe7389ee7a941.tar.gz
samba-2c6030415e0b1f421ea6e85fe6ffe7389ee7a941.tar.bz2
samba-2c6030415e0b1f421ea6e85fe6ffe7389ee7a941.zip
r17314: Optimisation for POSIX locking. If we're downgrading
a POSIX lock (applying a read-lock) and we overlap pending read locks then send them an unlock message, we may have allowed them to proceed. Jeremy. (This used to be commit a7a0b6ba50f4cf7c5a0a29809fdff9e1266a29e7)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index ed57c9f621..0304a6559f 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -137,7 +137,7 @@ BOOL push_blocking_lock_request( struct byte_range_lock *br_lck,
procid_self(),
offset,
count,
- PENDING_LOCK,
+ lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
blr->lock_flav,
lock_timeout ? True : False); /* blocking_lock. */