From f00f7a34a9affde0c179f73c5a07d732fe22499c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 2 Apr 2007 04:47:19 +0000 Subject: 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) --- source4/ntvfs/posix/pvfs_lock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/ntvfs/posix') 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); -- cgit