[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.

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 3d10917bc52e12abd1e72c91b6fe541fdfc0ba00..87f86ed7a7bfbe79f6c3aeb2bb78d8642abfb2d3 100644 (file)
--- 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;