svn commit: samba r22021 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge at samba.org]

Author: tridge
Date: 2007-04-02 04:47:19 +0000 (Mon, 02 Apr 2007)
New Revision: 22021

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22021

Log:

use the pid specified in the individual locks, not the request pid, in
locking requests.

This fixes a bug noticed by Ronnie Sahlberg (thanks!)

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c	2007-04-02 03:46:13 UTC (rev 22020)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c	2007-04-02 04:47:19 UTC (rev 22021)
@@ -125,7 +125,7 @@
 		 */
 		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 @@
 
 		status = brl_lock(pvfs->brl_context,
 				  f->brl_handle,
-				  req->smbpid,
+				  locks[i].pid,
 				  locks[i].offset,
 				  locks[i].count,
 				  rw, pending);