shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Clean up nfs4_preprocess_stateid_op() call sites

Browse Source 
[ Upstream commit eeff73f7c1 ]

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>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chuck Lever
2022-10-28 10:46:57 -04:00
committed by Greg Kroah-Hartman
parent e62d8c1281
commit 519a80ea5a
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
fs/nfsd/nfs4proc.c
View File

@@ -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, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
&read->rd_stateid, RD_STATE, &read->rd_stateid, RD_STATE,
&read->rd_nf, NULL); &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_rqstp = rqstp;
read->rd_fhp = &cstate->current_fh; read->rd_fhp = &cstate->current_fh;
return status; return status;
@@ -1117,10 +1112,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_stateid_op(rqstp, cstate, status = nfs4_preprocess_stateid_op(rqstp, cstate,
&cstate->current_fh, &setattr->sa_stateid, &cstate->current_fh, &setattr->sa_stateid,
WR_STATE, NULL, NULL); WR_STATE, NULL, NULL);
if (status) { if (status)
dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
return status; return status;
}
} }
err = fh_want_write(&cstate->current_fh); err = fh_want_write(&cstate->current_fh);
if (err) if (err)
@@ -1170,10 +1163,8 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
write->wr_offset, cnt); write->wr_offset, cnt);
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
stateid, WR_STATE, &nf, NULL); stateid, WR_STATE, &nf, NULL);
if (status) { if (status)
dprintk("NFSD: nfsd4_write: couldn't process stateid!\n");
return status; return status;
}
write->wr_how_written = write->wr_stable_how; write->wr_how_written = write->wr_stable_how;
@@ -1204,17 +1195,13 @@ nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->save_fh, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->save_fh,
src_stateid, RD_STATE, src, NULL); src_stateid, RD_STATE, src, NULL);
if (status) { if (status)
dprintk("NFSD: %s: couldn't process src stateid!\n", __func__);
goto out; goto out;
}
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
dst_stateid, WR_STATE, dst, NULL); dst_stateid, WR_STATE, dst, NULL);
if (status) { if (status)
dprintk("NFSD: %s: couldn't process dst stateid!\n", __func__);
goto out_put_src; goto out_put_src;
}
/* fix up for NFS-specific error code */ /* fix up for NFS-specific error code */
if (!S_ISREG(file_inode((*src)->nf_file)->i_mode) || if (!S_ISREG(file_inode((*src)->nf_file)->i_mode) ||
@@ -1935,10 +1922,8 @@ nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
&fallocate->falloc_stateid, &fallocate->falloc_stateid,
WR_STATE, &nf, NULL); WR_STATE, &nf, NULL);
if (status != nfs_ok) { if (status != nfs_ok)
dprintk("NFSD: nfsd4_fallocate: couldn't process stateid!\n");
return status; return status;
}
status = nfsd4_vfs_fallocate(rqstp, &cstate->current_fh, nf->nf_file, status = nfsd4_vfs_fallocate(rqstp, &cstate->current_fh, nf->nf_file,
fallocate->falloc_offset, fallocate->falloc_offset,
@@ -1994,10 +1979,8 @@ nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh, status = nfs4_preprocess_stateid_op(rqstp, cstate, &cstate->current_fh,
&seek->seek_stateid, &seek->seek_stateid,
RD_STATE, &nf, NULL); RD_STATE, &nf, NULL);
if (status) { if (status)
dprintk("NFSD: nfsd4_seek: couldn't process stateid!\n");
return status; return status;
}
switch (seek->seek_whence) { switch (seek->seek_whence) {
case NFS4_CONTENT_DATA: case NFS4_CONTENT_DATA: