From 1bba2ff86b2d15125e629b0007ea78081c7c0984 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 26 Feb 2004 06:46:09 -0800 Subject: [PATCH] [PATCH] kNFSd: NFSv4 locking state fix From: NeilBrown 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. --- fs/nfsd/nfs4state.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3d10917bc52e1..87f86ed7a7bfb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1994,13 +1994,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock strhashval = lock_ownerstr_hashval(inode, 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_stateowner)) { - printk("NFSD: nsfd4_lockt: lookup_lockowner() failed!\n"); - goto out; - } - + &lockt->lt_stateowner); sop = lockt->lt_stateowner; if (sop) { file_lock.fl_owner = (fl_owner_t) sop; -- 2.53.0