From: Trond Myklebust Date: Fri, 15 Feb 2019 21:08:25 +0000 (-0500) Subject: NFS: Don't recoalesce on error in nfs_pageio_complete_mirror() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8127d82705998568b52ac724e28e00941538083d;p=linux.git NFS: Don't recoalesce on error in nfs_pageio_complete_mirror() 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: a7d42ddb3099 ("nfs: add mirroring support to pgio layer") Signed-off-by: Trond Myklebust Cc: stable@vger.kernel.org # v4.0+ --- diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 03bde9a414512..a8951f1f7b4e0 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -1209,7 +1209,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;