lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 331/452] NFS: Dont report errors from nfs_pageio_complete() more than once
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ Upstream commit c5e483b77cc2edb318da152abe07e33006b975fd ]

    Since errors from nfs_pageio_complete() are already being reported
    through nfs_async_write_error(), we should not be returning them to the
    callers of do_writepages() as well. They will end up being reported
    through the generic mechanism instead.

    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/write.c | 9 +--------
    1 file changed, 1 insertion(+), 8 deletions(-)

    diff --git a/fs/nfs/write.c b/fs/nfs/write.c
    index b08323ed0c25..dc08a0c02f09 100644
    --- a/fs/nfs/write.c
    +++ b/fs/nfs/write.c
    @@ -675,11 +675,7 @@ static int nfs_writepage_locked(struct page *page,
    err = nfs_do_writepage(page, wbc, &pgio);
    pgio.pg_error = 0;
    nfs_pageio_complete(&pgio);
    - if (err < 0)
    - return err;
    - if (nfs_error_is_fatal(pgio.pg_error))
    - return pgio.pg_error;
    - return 0;
    + return err;
    }

    int nfs_writepage(struct page *page, struct writeback_control *wbc)
    @@ -730,9 +726,6 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)

    if (err < 0)
    goto out_err;
    - err = pgio.pg_error;
    - if (nfs_error_is_fatal(err))
    - goto out_err;
    return 0;
    out_err:
    return err;
    --
    2.35.1


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