Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f6e284 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

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: c373fff7 ("NFSv4: Don't special case "launder"")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.12+
Reviewed-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b1ee7da

fs/nfs/write.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

		}

		nfs_redirty_request(req);

		} else

			ret = -EAGAIN;

		nfs_redirty_request(req);

	} else

		nfs_add_stats(page_file_mapping(page)->host,

				NFSIOS_WRITEPAGES, 1);