diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2010-01-03 20:08:10 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2010-01-03 20:08:10 +0000 |
| commit | b51bb2125d48b478730f59c91b300fedb4562aa7 (patch) | |
| tree | a51426be45a4a0de5b1668ddf52c0ce01991f321 | |
| parent | e284ab29fb994b27443447d7aa6c8ac1914539d9 (diff) | |
| download | FreeBSD-src-b51bb2125d48b478730f59c91b300fedb4562aa7.zip FreeBSD-src-b51bb2125d48b478730f59c91b300fedb4562aa7.tar.gz | |
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
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 7794278..ba97c54 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -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))) { |
