From: Anna Schumaker Date: Tue, 13 Sep 2022 18:01:50 +0000 (-0400) Subject: NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=06981d560606ac48d61e5f4fff6738b925c93173;p=linux.git NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data 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. Signed-off-by: Anna Schumaker Link: https://lore.kernel.org/linux-nfs/20220907195259.926736-1-anna@kernel.org/T/#t Signed-off-by: Chuck Lever --- diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 30d4897e62ab9..0220e1fa214ba 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3991,7 +3991,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);