Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <b64175263e298bc957c8dbf9c7cd2ee6ed84651c.camel@kernel.org>
Subject: Re: [PATCH v2 7/7] NFSD: Clean up nfs4svc_encode_compoundres()
From:   Jeff Layton <jlayton@kernel.org>
To:     Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org
Date:   Mon, 29 Aug 2022 09:50:12 -0400
In-Reply-To: <166171266025.21449.2692376100575745686.stgit@manet.1015granger.net>
References: <166171174172.21449.5036120183381273656.stgit@manet.1015granger.net>
         <166171266025.21449.2692376100575745686.stgit@manet.1015granger.net>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-1.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Sun, 2022-08-28 at 14:51 -0400, Chuck Lever wrote:
> In today's Linux NFS server implementation, the NFS dispatcher
> initializes each XDR result stream, and the NFSv4 .pc_func and
> .pc_encode methods all use xdr_stream-based encoding. This keeps
> rq_res.len automatically updated. There is no longer a need for
> the WARN_ON_ONCE() check in nfs4svc_encode_compoundres().
>=20
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/nfs4xdr.c |    4 ----
>  1 file changed, 4 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 1e9690a061ec..af51e2a8ceb7 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -5423,12 +5423,8 @@ bool
>  nfs4svc_encode_compoundres(struct svc_rqst *rqstp, struct xdr_stream *xd=
r)
>  {
>  	struct nfsd4_compoundres *resp =3D rqstp->rq_resp;
> -	struct xdr_buf *buf =3D xdr->buf;
>  	__be32 *p;
> =20
> -	WARN_ON_ONCE(buf->len !=3D buf->head[0].iov_len + buf->page_len +
> -				 buf->tail[0].iov_len);
> -
>  	/*
>  	 * Send buffer space for the following items is reserved
>  	 * at the top of nfsd4_proc_compound().
>=20
>=20

Reviewed-by: Jeff Layton <jlayton@kernel.org>