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: <9fe0c36d7d846a17aa65ace8df09f66fde96980b.camel@kernel.org>
Subject: Re: [PATCH v4 1/2] NFSD: Return nfserr_serverfault if splice_ok but
 buf->pages have data
From:   Jeff Layton <jlayton@kernel.org>
To:     Anna Schumaker <anna@kernel.org>, linux-nfs@vger.kernel.org,
        chuck.lever@oracle.com
Date:   Thu, 15 Sep 2022 15:59:43 -0400
In-Reply-To: <20220913180151.1928363-2-anna@kernel.org>
References: <20220913180151.1928363-1-anna@kernel.org>
         <20220913180151.1928363-2-anna@kernel.org>
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 Tue, 2022-09-13 at 14:01 -0400, Anna Schumaker wrote:
> From: Anna Schumaker <Anna.Schumaker@Netapp.com>
>=20
> This was discussed with Chuck as part of this patch set. Returning
> nfserr_resource was decided to not be the best error message here, and
> he suggested changing to nfserr_serverfault instead.
>=20
> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
> ---
>  fs/nfsd/nfs4xdr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 1e9690a061ec..01dd73ed5720 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -3994,7 +3994,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, _=
_be32 nfserr,
>  	}
>  	if (resp->xdr->buf->page_len && splice_ok) {
>  		WARN_ON_ONCE(1);
> -		return nfserr_resource;
> +		return nfserr_serverfault;
>  	}
>  	xdr_commit_encode(xdr);
> =20

IIRC the problem is that nfserr_resource is not valid in v4.1+. Do we
also need to change the nfserr_resource return in the if block above
this one?
--=20
Jeff Layton <jlayton@kernel.org>