summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-04-02 04:47:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:41 -0500
commitf00f7a34a9affde0c179f73c5a07d732fe22499c (patch)
tree43a2a3053a9583ab344a9281fd86b03cba01aa57 /source4
parentcd5745d37855175d9cb4750d67e21f12e1c302d5 (diff)
downloadsamba-f00f7a34a9affde0c179f73c5a07d732fe22499c.tar.gz
samba-f00f7a34a9affde0c179f73c5a07d732fe22499c.tar.bz2
samba-f00f7a34a9affde0c179f73c5a07d732fe22499c.zip
r22021: use the pid specified in the individual locks, not the request pid, in
locking requests. This fixes a bug noticed by Ronnie Sahlberg (thanks!) (This used to be commit b4ac085816cbec93c9fd4543a7ce48c5f3f9dca6)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 2e0f77616b..4527cd3ed2 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -125,7 +125,7 @@ static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reas
*/
status = brl_lock(pvfs->brl_context,
f->brl_handle,
- req->smbpid,
+ locks[pending->pending_lock].pid,
locks[pending->pending_lock].offset,
locks[pending->pending_lock].count,
rw, pending);
@@ -174,7 +174,7 @@ static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reas
status = brl_lock(pvfs->brl_context,
f->brl_handle,
- req->smbpid,
+ locks[i].pid,
locks[i].offset,
locks[i].count,
rw, pending);