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: <9ae1b87c86abee8e2f7e234256e50fd42fc0e930.camel@kernel.org>
Subject: Re: [PATCH 1 3/3] NFSD: Finish converting the NFSv3 GETACL result
 encoder
From:   Jeff Layton <jlayton@kernel.org>
To:     Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org
Date:   Mon, 17 Oct 2022 09:04:08 -0400
In-Reply-To: <166593522862.1710.16255807600348080659.stgit@klimt.1015granger.net>
References: <166593521604.1710.10648202421284171508.stgit@klimt.1015granger.net>
         <166593522862.1710.16255807600348080659.stgit@klimt.1015granger.net>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Sun, 2022-10-16 at 11:47 -0400, Chuck Lever wrote:
> For some reason, the NFSv2 GETACL result encoder was fully converted
> to use the new nfs_stream_encode_acl(), but the NFSv3 equivalent was
> not similarly converted.
>=20
> Fixes: 20798dfe249a ("NFSD: Update the NFSv3 GETACL result encoder to use=
 struct xdr_stream")
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfsd/nfs3acl.c |   30 ++++++------------------------
>  1 file changed, 6 insertions(+), 24 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c
> index 9446c6743664..7c798b5f4ec6 100644
> --- a/fs/nfsd/nfs3acl.c
> +++ b/fs/nfsd/nfs3acl.c
> @@ -171,11 +171,7 @@ nfs3svc_encode_getaclres(struct svc_rqst *rqstp, str=
uct xdr_stream *xdr)
>  {
>  	struct nfsd3_getaclres *resp =3D rqstp->rq_resp;
>  	struct dentry *dentry =3D resp->fh.fh_dentry;
> -	struct kvec *head =3D rqstp->rq_res.head;
>  	struct inode *inode;
> -	unsigned int base;
> -	int n;
> -	int w;
> =20
>  	if (!svcxdr_encode_nfsstat3(xdr, resp->status))
>  		return false;
> @@ -187,26 +183,12 @@ nfs3svc_encode_getaclres(struct svc_rqst *rqstp, st=
ruct xdr_stream *xdr)
>  		if (xdr_stream_encode_u32(xdr, resp->mask) < 0)
>  			return false;
> =20
> -		base =3D (char *)xdr->p - (char *)head->iov_base;
> -
> -		rqstp->rq_res.page_len =3D w =3D nfsacl_size(
> -			(resp->mask & NFS_ACL)   ? resp->acl_access  : NULL,
> -			(resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
> -		while (w > 0) {
> -			if (!*(rqstp->rq_next_page++))
> -				return false;
> -			w -=3D PAGE_SIZE;
> -		}
> -
> -		n =3D nfsacl_encode(&rqstp->rq_res, base, inode,
> -				  resp->acl_access,
> -				  resp->mask & NFS_ACL, 0);
> -		if (n > 0)
> -			n =3D nfsacl_encode(&rqstp->rq_res, base + n, inode,
> -					  resp->acl_default,
> -					  resp->mask & NFS_DFACL,
> -					  NFS_ACL_DEFAULT);
> -		if (n <=3D 0)
> +		if (!nfs_stream_encode_acl(xdr, inode, resp->acl_access,
> +					   resp->mask & NFS_ACL, 0))
> +			return false;
> +		if (!nfs_stream_encode_acl(xdr, inode, resp->acl_default,
> +					   resp->mask & NFS_DFACL,
> +					   NFS_ACL_DEFAULT))
>  			return false;
>  		break;
>  	default:
>=20
>=20

Much cleaner.

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