diff options
author | Trond Myklebust <trondmy@gmail.com> | 2019-01-29 15:52:55 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-06 17:31:34 +0100 |
commit | f3f6e284de989d5f1b831bdd09835957dc12eaad (patch) | |
tree | f52fa0e1ed730248830326c5920cfe4be322a868 | |
parent | 2b1ee7daf46dff7a7c86cda4b41c892ec2516365 (diff) | |
download | linux-stable-f3f6e284de989d5f1b831bdd09835957dc12eaad.tar.gz linux-stable-f3f6e284de989d5f1b831bdd09835957dc12eaad.tar.bz2 linux-stable-f3f6e284de989d5f1b831bdd09835957dc12eaad.zip |
NFS: Fix up return value on fatal errors in nfs_page_async_flush()
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>
-rw-r--r-- | fs/nfs/write.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 19e6ea89ad26..2d956a7d5378 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -618,11 +618,12 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio, 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; /* @@ -632,9 +633,9 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio, 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); |