Commit 06981d56 authored by Anna Schumaker's avatar Anna Schumaker Committed by Chuck Lever
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Link: https://lore.kernel.org/linux-nfs/20220907195259.926736-1-anna@kernel.org/T/#t


Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5f5f8b6d

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);