diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-10-22 08:46:06 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-11-03 21:28:45 -0500 |
| commit | 457a50424bdde44fbd394ee459fdbfb9ffc4e412 (patch) | |
| tree | 9b88da6fb56220505900029933d60f5e1ae8edec /fs/nfs | |
| parent | 5decae1623f5a1e409ed6befdc7c03ce53e8cd09 (diff) | |
| download | linux-stable-457a50424bdde44fbd394ee459fdbfb9ffc4e412.tar.gz linux-stable-457a50424bdde44fbd394ee459fdbfb9ffc4e412.tar.bz2 linux-stable-457a50424bdde44fbd394ee459fdbfb9ffc4e412.zip | |
NFSv4: Delegation recalls should not find revoked delegations
If we're processsing a delegation recall, ignore the delegations that
have already been revoked or returned.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/delegation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index af549d70ec50..c34bb81d37e2 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -840,7 +840,7 @@ int nfs_async_inode_return_delegation(struct inode *inode, struct nfs_delegation *delegation; rcu_read_lock(); - delegation = rcu_dereference(NFS_I(inode)->delegation); + delegation = nfs4_get_valid_delegation(inode); if (delegation == NULL) goto out_enoent; if (stateid != NULL && @@ -866,6 +866,7 @@ nfs_delegation_find_inode_server(struct nfs_server *server, list_for_each_entry_rcu(delegation, &server->delegations, super_list) { spin_lock(&delegation->lock); if (delegation->inode != NULL && + !test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) && nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) { freeme = igrab(delegation->inode); if (freeme && nfs_sb_active(freeme->i_sb)) |