NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data
authorAnna Schumaker <Anna.Schumaker@Netapp.com>
Tue, 13 Sep 2022 18:01:50 +0000 (14:01 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 26 Sep 2022 18:02:41 +0000 (14:02 -0400)
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 <Anna.Schumaker@Netapp.com>
Link: https://lore.kernel.org/linux-nfs/20220907195259.926736-1-anna@kernel.org/T/#t
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/nfs4xdr.c

index 30d4897..0220e1f 100644 (file)
@@ -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);