Commit 457a5042 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 5decae16

fs/nfs/delegation.c

+2 −1
Original line number Diff line number Diff line
@@ -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))