diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-30 08:27:27 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2014-08-05 10:55:12 -0400 |
| commit | 51f5e78355db2e9b4d5d9093f83be3567178d236 (patch) | |
| tree | c9bad341d4b8394622d868034da0efeb27b7199f /fs/nfsd | |
| parent | nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateid (diff) | |
| download | linux-dev-51f5e78355db2e9b4d5d9093f83be3567178d236.tar.xz linux-dev-51f5e78355db2e9b4d5d9093f83be3567178d236.zip | |
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 712d7e75e7dd..0f9e8426b2dd 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5577,11 +5577,9 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, 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 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, 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 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp, spin_unlock(&clp->cl_lock); if (lo) release_lockowner(lo); -out: - nfs4_unlock_state(); return status; } |