NFSd: Clean up nfs4_preprocess_stateid_op

Move the state locking and file descriptor reference out from the
callers and into nfs4_preprocess_stateid_op() itself.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 0 insertions, 11 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index d543222babf3..ac837783b37d 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -786,7 +786,6 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         if (!nfsd4_last_compound_op(rqstp))
                 rqstp->rq_splice_ok = false;
 
-        nfs4_lock_state();
         /* check stateid */
         if ((status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),
                                                  cstate, &read->rd_stateid,
@@ -794,11 +793,8 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
                 goto out;
         }
-        if (read->rd_filp)
-                get_file(read->rd_filp);
         status = nfs_ok;
 out:
-        nfs4_unlock_state();
         read->rd_rqstp = rqstp;
         read->rd_fhp = &cstate->current_fh;
         return status;
@@ -937,10 +933,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         int err;
 
         if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
-                nfs4_lock_state();
                 status = nfs4_preprocess_stateid_op(SVC_NET(rqstp), cstate,
                         &setattr->sa_stateid, WR_STATE, NULL);
-                nfs4_unlock_state();
                 if (status) {
                         dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
                         return status;
@@ -1006,17 +1000,12 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
         if (write->wr_offset >= OFFSET_MAX)
                 return nfserr_inval;
 
-        nfs4_lock_state();
         status = nfs4_preprocess_stateid_op(SVC_NET(rqstp),
                                         cstate, stateid, WR_STATE, &filp);
         if (status) {
-                nfs4_unlock_state();
                 dprintk("NFSD: nfsd4_write: couldn't process stateid!\n");
                 return status;
         }
-        if (filp)
-                get_file(filp);
-        nfs4_unlock_state();
 
         cnt = write->wr_buflen;
         write->wr_how_written = write->wr_stable_how;