diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-15 16:08:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-20 15:14:20 -0500 |
| commit | 8127d82705998568b52ac724e28e00941538083d (patch) | |
| tree | 54bddab707e6f1dba1724f2df85d3215a7c0f68d /fs/nfs/pagelist.c | |
| parent | NFS: Fix an I/O request leakage in nfs_do_recoalesce (diff) | |
| download | linux-dev-8127d82705998568b52ac724e28e00941538083d.tar.xz linux-dev-8127d82705998568b52ac724e28e00941538083d.zip | |
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 <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.0+
Diffstat (limited to 'fs/nfs/pagelist.c')
| -rw-r--r-- | fs/nfs/pagelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 03bde9a41451..a8951f1f7b4e 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; |