nfsd: Remove nfs4_lock_state(): nfsd4_release_lockowner
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 712d7e7..0f9e842 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -5577,11 +5577,9 @@
dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
clid->cl_boot, clid->cl_id);
- nfs4_lock_state();
-
status = lookup_clientid(clid, cstate, nn);
if (status)
- goto out;
+ return status;
clp = cstate->clp;
/* Find the matching lock stateowner */
@@ -5598,7 +5596,7 @@
if (check_for_locks(stp->st_stid.sc_file, lo)) {
status = nfserr_locks_held;
spin_unlock(&clp->cl_lock);
- goto out;
+ return status;
}
}
@@ -5608,8 +5606,6 @@
spin_unlock(&clp->cl_lock);
if (lo)
release_lockowner(lo);
-out:
- nfs4_unlock_state();
return status;
}