diff options
| author | Trond Myklebust | 2019-03-12 21:04:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-26 09:14:22 +0200 |
| commit | f64ff5914f00f51882da9cdc269f067d7b82a774 (patch) | |
| tree | cc5aa52431f48d19cc37de09d835f01f42258f06 | |
| parent | pnfs/flexfiles: Fix PTR_ERR() dereferences in ff_layout_track_ds_error (diff) | |
| download | kernel-qcow2-linux-f64ff5914f00f51882da9cdc269f067d7b82a774.tar.gz kernel-qcow2-linux-f64ff5914f00f51882da9cdc269f067d7b82a774.tar.xz kernel-qcow2-linux-f64ff5914f00f51882da9cdc269f067d7b82a774.zip | |
pNFS: Fix a typo in pnfs_update_layout
commit 400417b05f3ec0531544ca5f94e64d838d8b8849 upstream.
We're supposed to wait for the outstanding layout count to go to zero,
but that got lost somehow.
Fixes: d03360aaf5cca ("pNFS: Ensure we return the error if someone...")
Reported-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 7d9a51e6b847..1aa628c98966 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1866,7 +1866,7 @@ lookup_again: atomic_read(&lo->plh_outstanding) != 0) { spin_unlock(&ino->i_lock); lseg = ERR_PTR(wait_var_event_killable(&lo->plh_outstanding, - atomic_read(&lo->plh_outstanding))); + !atomic_read(&lo->plh_outstanding))); if (IS_ERR(lseg) || !list_empty(&lo->plh_segs)) goto out_put_layout_hdr; pnfs_put_layout_hdr(lo); |