hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfsd4: remove redundant encode buffer size checking 

Now that all op encoders can handle running out of space, we no longer
need to check the remaining size for every operation; only nonidempotent
operations need that check, and that can be done by
nfsd4_check_resp_size.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2014-03-08 17:19:55 -05:00
parent 67492c9903
commit ea8d7720b2
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/nfs4proc.c
View File

@ -1279,7 +1279,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
struct nfsd4_compound_state *cstate = &resp->cstate; struct nfsd4_compound_state *cstate = &resp->cstate;
struct svc_fh *current_fh = &cstate->current_fh; struct svc_fh *current_fh = &cstate->current_fh;
struct svc_fh *save_fh = &cstate->save_fh; struct svc_fh *save_fh = &cstate->save_fh;
int slack_bytes;
u32 plen = 0; u32 plen = 0;
__be32 status; __be32 status;
@ -1333,19 +1332,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
goto encode_op; goto encode_op;
} }
/* We must be able to encode a successful response to
* this operation, with enough room left over to encode a
* failed response to the next operation. If we don't
* have enough room, fail with ERR_RESOURCE.
*/
slack_bytes = (char *)resp->xdr.end - (char *)resp->xdr.p;
if (slack_bytes < COMPOUND_SLACK_SPACE
+ COMPOUND_ERR_SLACK_SPACE) {
BUG_ON(slack_bytes < COMPOUND_ERR_SLACK_SPACE);
op->status = nfserr_resource;
goto encode_op;
}
opdesc = OPDESC(op); opdesc = OPDESC(op);
if (!current_fh->fh_dentry) { if (!current_fh->fh_dentry) {

22
fs/nfsd/nfs4xdr.c
View File

@ -3753,20 +3753,24 @@ static nfsd4_enc nfsd4_enc_ops[] = {
__be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad) __be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad)
{ {
struct xdr_buf *buf = &resp->rqstp->rq_res; struct xdr_buf *buf = &resp->rqstp->rq_res;
struct nfsd4_session *session = NULL; struct nfsd4_session *session = resp->cstate.session;
struct nfsd4_slot *slot = resp->cstate.slot; struct nfsd4_slot *slot = resp->cstate.slot;
int slack_bytes = (char *)resp->xdr.end - (char *)resp->xdr.p;
if (!nfsd4_has_session(&resp->cstate)) if (nfsd4_has_session(&resp->cstate)) {
return 0;
session = resp->cstate.session; if (buf->len + pad > session->se_fchannel.maxresp_sz)
return nfserr_rep_too_big;
if (buf->len + pad > session->se_fchannel.maxresp_sz) if ((slot->sl_flags & NFSD4_SLOT_CACHETHIS) &&
return nfserr_rep_too_big; buf->len + pad > session->se_fchannel.maxresp_cached)
return nfserr_rep_too_big_to_cache;
}
if ((slot->sl_flags & NFSD4_SLOT_CACHETHIS) && if (pad > slack_bytes) {
buf->len + pad > session->se_fchannel.maxresp_cached) WARN_ON_ONCE(nfsd4_has_session(&resp->cstate));
return nfserr_rep_too_big_to_cache; return nfserr_resource;
}
return 0; return 0;
} }