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

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

NFS: Don't recoalesce on error in nfs_pageio_complete_mirror() 



commit 8127d82705998568b52ac724e28e00941538083d upstream.

If the I/O completion failed with a fatal error, then we should just
exit nfs_pageio_complete_mirror() rather than try to recoalesce.

Fixes: a7d42ddb ("nfs: add mirroring support to pgio layer")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63b0ee12

fs/nfs/pagelist.c

+1 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc, 
		desc->pg_mirror_idx = mirror_idx;

	for (;;) {

		nfs_pageio_doio(desc);

		if (!mirror->pg_recoalesce)

		if (desc->pg_error < 0 || !mirror->pg_recoalesce)

			break;

		if (!nfs_do_recoalesce(desc))

			break;