svn commit: r201442 - head/sys/fs/nfsserver
Rick Macklem
rmacklem at FreeBSD.org
Sun Jan 3 20:08:11 UTC 2010
Author: rmacklem
Date: Sun Jan 3 20:08:10 2010
New Revision: 201442
URL: http://svn.freebsd.org/changeset/base/201442
Log:
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".
MFC after: 2 weeks
Modified:
head/sys/fs/nfsserver/nfs_nfsdstate.c
Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c Sun Jan 3 19:28:51 2010 (r201441)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c Sun Jan 3 20:08:10 2010 (r201442)
@@ -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))) {
More information about the svn-src-all
mailing list