commit b57562087b0473374de61a7cc8ea200c4e34d295
author Trond Myklebust <trond.myklebust@hammerspace.com> Tue Oct 22 13:34:06 2019 -0400
committer Trond Myklebust <trond.myklebust@hammerspace.com> Sun Nov 03 21:28:45 2019 -0500
tree b04ba82bfbdf18853e2345aed128a8bca75cfd5e
parent 457a50424bdde44fbd394ee459fdbfb9ffc4e412

NFSv4: fail nfs4_refresh_delegation_stateid() when the delegation was revoked

If the delegation was revoked, we don't want to retry the delegreturn.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

fs/nfs/delegation.c

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index c34bb81..630167e 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -1190,7 +1190,8 @@
 	rcu_read_lock();
 	delegation = rcu_dereference(NFS_I(inode)->delegation);
 	if (delegation != NULL &&
-	    nfs4_stateid_match_other(dst, &delegation->stateid)) {
+	    nfs4_stateid_match_other(dst, &delegation->stateid) &&
+	    !test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
 		dst->seqid = delegation->stateid.seqid;
 		ret = true;
 	}