Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f5e783 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Remove nfs4_lock_state(): nfsd4_release_lockowner 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent e7d5dc19

fs/nfsd/nfs4state.c

+2 −6
Original line number Diff line number Diff line
@@ -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;

}