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

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

commit 8127d827 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
...@@ -1214,7 +1214,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc, ...@@ -1214,7 +1214,7 @@ static void nfs_pageio_complete_mirror(struct nfs_pageio_descriptor *desc,
desc->pg_mirror_idx = mirror_idx; desc->pg_mirror_idx = mirror_idx;
for (;;) { for (;;) {
nfs_pageio_doio(desc); nfs_pageio_doio(desc);
if (!mirror->pg_recoalesce) if (desc->pg_error < 0 || !mirror->pg_recoalesce)
break; break;
if (!nfs_do_recoalesce(desc)) if (!nfs_do_recoalesce(desc))
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment