diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-18 15:33:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-18 15:33:42 -0400 |
| commit | 58bbeab425c6c5e318f5b6ae31d351331ddfb34b (patch) | |
| tree | 2f59406cf2d41b31d5b3c7e761b9d14185ab3b79 /fs/nfs | |
| parent | SUNRPC: Optimise transport balancing code (diff) | |
| download | linux-dev-58bbeab425c6c5e318f5b6ae31d351331ddfb34b.tar.xz linux-dev-58bbeab425c6c5e318f5b6ae31d351331ddfb34b.zip | |
pnfs: Fix a problem where we gratuitously start doing I/O through the MDS
If the client has to stop in pnfs_update_layout() to wait for another
layoutget to complete, it currently exits and defaults to I/O through
the MDS if the layoutget was successful.
Fixes: d03360aaf5cc ("pNFS: Ensure we return the error if someone kills...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.20+
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/pnfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 5b9145c62fd9..758917463700 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1890,7 +1890,7 @@ lookup_again: spin_unlock(&ino->i_lock); lseg = ERR_PTR(wait_var_event_killable(&lo->plh_outstanding, !atomic_read(&lo->plh_outstanding))); - if (IS_ERR(lseg) || !list_empty(&lo->plh_segs)) + if (IS_ERR(lseg)) goto out_put_layout_hdr; pnfs_put_layout_hdr(lo); goto lookup_again; |