From: Olga Kornievskaia <kolga@netapp.com>
Date: Wed, 26 Apr 2017 18:21:22 +0000 (-0400)
Subject: NFS4.1 handle interrupted slot reuse from ERR_DELAY
X-Git-Tag: v4.12-rc1~32^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=88bd4f862943205183c2fc20bbba103c71e9990b;p=karo-tx-linux.git

NFS4.1 handle interrupted slot reuse from ERR_DELAY

If the RPC slot was interrupted and server replied to the next
operation on the "reused" slot with ERR_DELAY, don't clear out
the "interrupted" flag until we properly recover.

Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dbfc7574fab0..c2b82caa9068 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -698,7 +698,8 @@ static int nfs41_sequence_process(struct rpc_task *task,
 	session = slot->table->session;
 
 	if (slot->interrupted) {
-		slot->interrupted = 0;
+		if (res->sr_status != -NFS4ERR_DELAY)
+			slot->interrupted = 0;
 		interrupted = true;
 	}