From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Sun, 27 Oct 2019 02:37:40 +0000 (-0400)
Subject: NFSv4: Don't retry the GETATTR on old stateid in nfs4_delegreturn_done()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70d136b2dc184f1c9d026de443dbe635ea8a0839;p=linux.git

NFSv4: Don't retry the GETATTR on old stateid in nfs4_delegreturn_done()

If the server returns NFS4ERR_OLD_STATEID, then just skip retrying the
GETATTR when replaying the delegreturn compound. We know nothing will
have changed on the server.

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 33a8e53e976c6..a64ce95187768 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6198,6 +6198,10 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
 	case -NFS4ERR_OLD_STATEID:
 		if (!nfs4_refresh_delegation_stateid(&data->stateid, data->inode))
 			nfs4_stateid_seqid_inc(&data->stateid);
+		if (data->args.bitmask) {
+			data->args.bitmask = NULL;
+			data->res.fattr = NULL;
+		}
 		goto out_restart;
 	case -NFS4ERR_ACCESS:
 		if (data->args.bitmask) {