leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSv4: Delegation recalls should not find revoked delegations

Browse Source 
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>
This commit is contained in:
Trond Myklebust
2019-10-22 08:46:06 -04:00
parent 5decae1623
commit 457a50424b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/delegation.c
View File

@@ -840,7 +840,7 @@ int nfs_async_inode_return_delegation(struct inode *inode,
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
rcu_read_lock(); rcu_read_lock();
delegation = rcu_dereference(NFS_I(inode)->delegation); delegation = nfs4_get_valid_delegation(inode);
if (delegation == NULL) if (delegation == NULL)
goto out_enoent; goto out_enoent;
if (stateid != NULL && 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) { list_for_each_entry_rcu(delegation, &server->delegations, super_list) {
spin_lock(&delegation->lock); spin_lock(&delegation->lock);
if (delegation->inode != NULL && if (delegation->inode != NULL &&
!test_bit(NFS_DELEGATION_REVOKED, &delegation->flags) &&
nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) { nfs_compare_fh(fhandle, &NFS_I(delegation->inode)->fh) == 0) {
freeme = igrab(delegation->inode); freeme = igrab(delegation->inode);
if (freeme && nfs_sb_active(freeme->i_sb)) if (freeme && nfs_sb_active(freeme->i_sb))