diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-04 22:09:44 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-12 20:56:19 +0200 |
| commit | 8f70f53a87007bdbb34c79d11178a153914f5db1 (patch) | |
| tree | abdb1e8e5dea6942624032e9d56f1436bd8434da /fs/nfs/pnfs.c | |
| parent | NFSv4.1/pnfs: Remove redundant checks in pnfs_layoutgets_blocked() (diff) | |
| download | linux-8f70f53a87007bdbb34c79d11178a153914f5db1.tar.xz linux-8f70f53a87007bdbb34c79d11178a153914f5db1.zip | |
NFSv4.1/pnfs: Fix serialisation of layout return and layoutget
We should always test for outstanding layout returns, whether or not
pnfs_should_retry_layoutget() is true.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 8855b322d127..e3a47ee15474 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1436,6 +1436,8 @@ static int pnfs_layoutget_retry_bit_wait(struct wait_bit_key *key) static bool pnfs_prepare_to_retry_layoutget(struct pnfs_layout_hdr *lo) { + if (!pnfs_should_retry_layoutget(lo)) + return false; /* * send layoutcommit as it can hold up layoutreturn due to lseg * reference @@ -1531,8 +1533,7 @@ lookup_again: * Because we free lsegs before sending LAYOUTRETURN, we need to wait * for LAYOUTRETURN even if first is true. */ - if (!lseg && pnfs_should_retry_layoutget(lo) && - test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) { + if (test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) { spin_unlock(&ino->i_lock); dprintk("%s wait for layoutreturn\n", __func__); if (pnfs_prepare_to_retry_layoutget(lo)) { |