Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea8d7720 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 67492c99

fs/nfsd/nfs4proc.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -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) {

fs/nfsd/nfs4xdr.c

+13 −9
Original line number Original line Diff line number Diff line
@@ -3753,13 +3753,11 @@ 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)

		if (buf->len + pad > session->se_fchannel.maxresp_sz)

			return nfserr_rep_too_big;

			return nfserr_rep_too_big;
@@ -3767,6 +3765,12 @@ __be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad) 
		if ((slot->sl_flags & NFSD4_SLOT_CACHETHIS) &&

		if ((slot->sl_flags & NFSD4_SLOT_CACHETHIS) &&

		    buf->len + pad > session->se_fchannel.maxresp_cached)

		    buf->len + pad > session->se_fchannel.maxresp_cached)

			return nfserr_rep_too_big_to_cache;

			return nfserr_rep_too_big_to_cache;

	}



	if (pad > slack_bytes) {

		WARN_ON_ONCE(nfsd4_has_session(&resp->cstate));

		return nfserr_resource;

	}





	return 0;

	return 0;

}

}