svn commit: r202525 - stable/8/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sun Jan 17 20:49:34 2010
New Revision: 202525
URL: http://svn.freebsd.org/changeset/base/202525

Log:
  MFC: r201442
  The test for "same client" for the experimental nfs server over NFSv4
  was broken w.r.t. byte range lock conflicts when it was the same client
  and the request used the open_to_lock_owner4 case, since lckstp->ls_clp
  was not set. This patch fixes it by using "clp" instead of "lckstp->ls_clp".

Modified:
  stable/8/sys/fs/nfsserver/nfs_nfsdstate.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Jan 17 20:18:59 2010	(r202524)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Jan 17 20:49:34 2010	(r202525)
@@ -1753,7 +1753,7 @@ tryagain:
 		(new_lop->lo_flags == NFSLCK_WRITE ||
 		 lop->lo_flags == NFSLCK_WRITE) &&
 		lckstp != lop->lo_stp &&
-		(lckstp->ls_clp != lop->lo_stp->ls_clp ||
+		(clp != lop->lo_stp->ls_clp ||
 		 lckstp->ls_ownerlen != lop->lo_stp->ls_ownerlen ||
 		 NFSBCMP(lckstp->ls_owner, lop->lo_stp->ls_owner,
 		    lckstp->ls_ownerlen))) {