lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 677/862] NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data
    Date
    From: Anna Schumaker <Anna.Schumaker@Netapp.com>

    [ Upstream commit 06981d560606ac48d61e5f4fff6738b925c93173 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/nfs4xdr.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
    index ac1b03cf05a5..2960d0a8e8f9 100644
    --- a/fs/nfsd/nfs4xdr.c
    +++ b/fs/nfsd/nfs4xdr.c
    @@ -3988,7 +3988,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);

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:32    [W:2.077 / U:0.448 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site