NFSD: Clean up nfs4_preprocess_stateid_op() call sites

Remove the lame-duck dprintk()s around nfs4_preprocess_stateid_op()
call sites.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: NeilBrown <neilb@suse.de>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 42db62413890e1f900fbb08d3e4afa2beea9fb0c..6f7e0c5e62d2b8d7a39bc040c2c8cea8276ed200 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -943,12 +943,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
                                        &read->rd_stateid, RD_STATE,
                                        &read->rd_nf, NULL);
-       if (status) {
-               dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");
-               goto out;
-       }
-       status = nfs_ok;
-out:
+
        read->rd_rqstp = rqstp;
        read->rd_fhp = &cstate->current_fh;
        return status;
@@ -1117,10 +1112,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                status = nfs4_preprocess_stateid_op(rqstp, cstate,
                                &cstate->current_fh, &setattr->sa_stateid,
                                WR_STATE, NULL, NULL);
-               if (status) {
-                       dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
+               if (status)
                        return status;
-               }
        }
        err = fh_want_write(&cstate->current_fh);
        if (err)
@@ -1168,10 +1161,8 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                               write->wr_offset, cnt);
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
                                                stateid, WR_STATE, &nf, NULL);
-       if (status) {
-               dprintk("NFSD: nfsd4_write: couldn't process stateid!\n");
+       if (status)
                return status;
-       }
 
        write->wr_how_written = write->wr_stable_how;
 
@@ -1202,17 +1193,13 @@ nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->save_fh,
                                            src_stateid, RD_STATE, src, NULL);
-       if (status) {
-               dprintk("NFSD: %s: couldn't process src stateid!\n", __func__);
+       if (status)
                goto out;
-       }
 
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
                                            dst_stateid, WR_STATE, dst, NULL);
-       if (status) {
-               dprintk("NFSD: %s: couldn't process dst stateid!\n", __func__);
+       if (status)
                goto out_put_src;
-       }
 
        /* fix up for NFS-specific error code */
        if (!S_ISREG(file_inode((*src)->nf_file)->i_mode) ||
@@ -1957,10 +1944,8 @@ nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
                                            &fallocate->falloc_stateid,
                                            WR_STATE, &nf, NULL);
-       if (status != nfs_ok) {
-               dprintk("NFSD: nfsd4_fallocate: couldn't process stateid!\n");
+       if (status != nfs_ok)
                return status;
-       }
 
        status = nfsd4_vfs_fallocate(rqstp, &cstate->current_fh, nf->nf_file,
                                     fallocate->falloc_offset,
@@ -2016,10 +2001,8 @@ nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
                                            &seek->seek_stateid,
                                            RD_STATE, &nf, NULL);
-       if (status) {
-               dprintk("NFSD: nfsd4_seek: couldn't process stateid!\n");
+       if (status)
                return status;
-       }
 
        switch (seek->seek_whence) {
        case NFS4_CONTENT_DATA: