diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-19 14:08:37 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-04 22:35:40 -0400 |
| commit | 5eb8d18ca0e001c6055da2b7f30d8f6dca23a44f (patch) | |
| tree | f70d59c3ba857e5353e01e70f616fbc2a9b99e58 /fs/nfs/delegation.c | |
| parent | 8c39a39e28b86a4021d9be314ce01019bafa5fdc (diff) | |
| download | linux-stable-5eb8d18ca0e001c6055da2b7f30d8f6dca23a44f.tar.gz linux-stable-5eb8d18ca0e001c6055da2b7f30d8f6dca23a44f.tar.bz2 linux-stable-5eb8d18ca0e001c6055da2b7f30d8f6dca23a44f.zip | |
NFSv4: Fix delegation state recovery
Once we clear the NFS_DELEGATED_STATE flag, we're telling
nfs_delegation_claim_opens() that we're done recovering all open state
for that stateid, so we really need to ensure that we test for all
open modes that are currently cached and recover them before exiting
nfs4_open_delegation_recall().
Fixes: 24311f884189d ("NFSv4: Recovery of recalled read delegations...")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v4.3+
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 0ff3facf81da..0af854cce8ff 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -153,7 +153,7 @@ again: /* Block nfs4_proc_unlck */ mutex_lock(&sp->so_delegreturn_mutex); seq = raw_seqcount_begin(&sp->so_reclaim_seqcount); - err = nfs4_open_delegation_recall(ctx, state, stateid, type); + err = nfs4_open_delegation_recall(ctx, state, stateid); if (!err) err = nfs_delegation_claim_locks(state, stateid); if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq)) |