lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 201/411] NFS: Do not report flush errors in nfs_write_end()
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ Upstream commit d95b26650e86175e4a97698d89bc1626cd1df0c6 ]

    If we do flush cached writebacks in nfs_write_end() due to the imminent
    expiration of an RPCSEC_GSS session, then we should defer reporting any
    resulting errors until the calls to file_check_and_advance_wb_err() in
    nfs_file_write() and nfs_file_fsync().

    Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/file.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/fs/nfs/file.c b/fs/nfs/file.c
    index 73415970af38..3233da79d49a 100644
    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -394,11 +394,8 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
    return status;
    NFS_I(mapping->host)->write_io += copied;

    - if (nfs_ctx_key_to_expire(ctx, mapping->host)) {
    - status = nfs_wb_all(mapping->host);
    - if (status < 0)
    - return status;
    - }
    + if (nfs_ctx_key_to_expire(ctx, mapping->host))
    + nfs_wb_all(mapping->host);

    return copied;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 13:26    [W:4.022 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site