Commit 0d104167 authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Clear NFS_DELEGATION_RETURN_IF_CLOSED when the delegation is returned 



If a delegation is marked as needing to be returned when the file is
closed, then don't clear that marking until we're ready to return
it.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent f885ea64

fs/nfs/delegation.c

+3 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation) 


	if (test_and_clear_bit(NFS_DELEGATION_RETURN, &delegation->flags))

		ret = true;

	if (test_and_clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags) && !ret) {

	else if (test_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags)) {

		struct inode *inode;



		spin_lock(&delegation->lock);
@@ -488,6 +488,8 @@ static bool nfs_delegation_need_return(struct nfs_delegation *delegation) 
			ret = true;

		spin_unlock(&delegation->lock);

	}

	if (ret)

		clear_bit(NFS_DELEGATION_RETURN_IF_CLOSED, &delegation->flags);

	if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) ||

	    test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))

		ret = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE