lkml.org 
[lkml]   [2019]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 39/74] NFS: Fix up return value on fatal errors in nfs_page_async_flush()
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <trondmy@gmail.com>

    commit 8fc75bed96bb94e23ca51bd9be4daf65c57697bf upstream.

    Ensure that we return the fatal error value that caused us to exit
    nfs_page_async_flush().

    Fixes: c373fff7bd25 ("NFSv4: Don't special case "launder"")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Cc: stable@vger.kernel.org # v4.12+
    Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfs/write.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/fs/nfs/write.c
    +++ b/fs/nfs/write.c
    @@ -621,11 +621,12 @@ static int nfs_page_async_flush(struct n
    nfs_set_page_writeback(page);
    WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags));

    - ret = 0;
    + ret = req->wb_context->error;
    /* If there is a fatal error that covers this write, just exit */
    - if (nfs_error_is_fatal_on_server(req->wb_context->error))
    + if (nfs_error_is_fatal_on_server(ret))
    goto out_launder;

    + ret = 0;
    if (!nfs_pageio_add_request(pgio, req)) {
    ret = pgio->pg_error;
    /*
    @@ -635,9 +636,9 @@ static int nfs_page_async_flush(struct n
    nfs_context_set_write_error(req->wb_context, ret);
    if (nfs_error_is_fatal_on_server(ret))
    goto out_launder;
    - }
    + } else
    + ret = -EAGAIN;
    nfs_redirty_request(req);
    - ret = -EAGAIN;
    } else
    nfs_add_stats(page_file_mapping(page)->host,
    NFSIOS_WRITEPAGES, 1);

    \
     
     \ /
      Last update: 2019-02-04 11:48    [W:4.041 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site