Commit 1bba2ff8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] kNFSd: NFSv4 locking state fix

From: NeilBrown <neilb@cse.unsw.edu.au>

It's OK for the find_lockstateowner_str to fail; that just means we haven't
seen the lockowner, and will compare the request range to all locks on the
file.
parent b9eb1ee0
...@@ -1994,13 +1994,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock ...@@ -1994,13 +1994,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock
strhashval = lock_ownerstr_hashval(inode, strhashval = lock_ownerstr_hashval(inode,
lockt->lt_clientid.cl_id, lockt->lt_owner); lockt->lt_clientid.cl_id, lockt->lt_owner);
if (find_lockstateowner_str(strhashval, &lockt->lt_owner, find_lockstateowner_str(strhashval, &lockt->lt_owner,
&lockt->lt_clientid, &lockt->lt_clientid,
&lockt->lt_stateowner)) { &lockt->lt_stateowner);
printk("NFSD: nsfd4_lockt: lookup_lockowner() failed!\n");
goto out;
}
sop = lockt->lt_stateowner; sop = lockt->lt_stateowner;
if (sop) { if (sop) {
file_lock.fl_owner = (fl_owner_t) sop; file_lock.fl_owner = (fl_owner_t) sop;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment