nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_close

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 2712cd3e77a0a1f88bcb3d2692ad0629b46d7726..cde72d85991d59844a921064cd98a76a6c083b69 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4713,7 +4713,6 @@ put_stateid:
        nfs4_put_stid(&stp->st_stid);
 out:
        nfsd4_bump_seqid(cstate, status);
-       nfs4_unlock_state();
        return status;
 }
 
@@ -4760,7 +4759,6 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
                dprintk("NFSD: %s: od_deleg_want=0x%x ignored\n", __func__,
                        od->od_deleg_want);
 
-       nfs4_lock_state();
        status = nfs4_preprocess_confirmed_seqid_op(cstate, od->od_seqid,
                                        &od->od_stateid, &stp, nn);
        if (status)
@@ -4826,7 +4824,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        dprintk("NFSD: nfsd4_close on file %pd\n", 
                        cstate->current_fh.fh_dentry);
 
-       nfs4_lock_state();
        status = nfs4_preprocess_seqid_op(cstate, close->cl_seqid,
                                        &close->cl_stateid,
                                        NFS4_OPEN_STID|NFS4_CLOSED_STID,
@@ -4842,7 +4839,6 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        /* put reference from nfs4_preprocess_seqid_op */
        nfs4_put_stid(&stp->st_stid);
 out:
-       nfs4_unlock_state();
        return status;
 }