nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renew

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 e6b27ede3388ebffab0ca137f745d916f5b15b61..a4ae38b61933d3b5a9389e5ebb2247106445b5fe 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2948,7 +2948,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        if (new == NULL)
                return nfserr_jukebox;
        /* Cases below refer to rfc 3530 section 14.2.33: */
-       nfs4_lock_state();
        spin_lock(&nn->client_lock);
        conf = find_confirmed_client_by_name(&clname, nn);
        if (conf) {
@@ -2983,7 +2982,6 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        status = nfs_ok;
 out:
        spin_unlock(&nn->client_lock);
-       nfs4_unlock_state();
        if (new)
                free_client(new);
        if (unconf)
@@ -3006,7 +3004,6 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
 
        if (STALE_CLIENTID(clid, nn))
                return nfserr_stale_clientid;
-       nfs4_lock_state();
 
        spin_lock(&nn->client_lock);
        conf = find_confirmed_client(clid, false, nn);
@@ -3056,7 +3053,6 @@ out:
        spin_unlock(&nn->client_lock);
        if (old)
                expire_client(old);
-       nfs4_unlock_state();
        return status;
 }
 
@@ -4113,7 +4109,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        __be32 status;
        struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
 
-       nfs4_lock_state();
        dprintk("process_renew(%08x/%08x): starting\n", 
                        clid->cl_boot, clid->cl_id);
        status = lookup_clientid(clid, cstate, nn);
@@ -4126,7 +4121,6 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                goto out;
        status = nfs_ok;
 out:
-       nfs4_unlock_state();
        return status;
 }