diff options
| author |   Anna Schumaker <Anna.Schumaker@Netapp.com> | 2022-09-13 14:01:50 -0400 |
|---|---|---|
| committer |   Chuck Lever <chuck.lever@oracle.com> | 2022-09-26 14:02:41 -0400 |
| commit | 06981d560606ac48d61e5f4fff6738b925c93173 (patch) | |
| tree | 23d770abbadde259348cc9b93f898eca006cdaf2 | |
| parent | NFSD: Make nfsd4_remove() wait before returning NFS4ERR_DELAY (diff) | |
| download | linux-dev-06981d560606ac48d61e5f4fff6738b925c93173.tar.xz linux-dev-06981d560606ac48d61e5f4fff6738b925c93173.zip | |
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 <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>
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 30d4897e62ab..0220e1fa214b 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); |