commit 150e7260f309fd07e853c05f7fc55b7cccb4780d
author Trond Myklebust <trond.myklebust@primarydata.com> Tue Mar 18 14:23:11 2014 -0400
committer Trond Myklebust <trond.myklebust@primarydata.com> Wed Mar 19 08:34:40 2014 -0400
tree 0bfbd8bdf2868948359a972ee0cb475d42f353e5
parent f9b7ebdf7e41671de7926a5951c324258200b42a

NFSv4: Ensure we respect soft mount timeouts during trunking discovery

Tested-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

fs/nfs/nfs4state.c

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index f544a15..2349518 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -2075,8 +2075,10 @@
 	switch (status) {
 	case 0:
 		break;
-	case -NFS4ERR_DELAY:
 	case -ETIMEDOUT:
+		if (clnt->cl_softrtry)
+			break;
+	case -NFS4ERR_DELAY:
 	case -EAGAIN:
 		ssleep(1);
 	case -NFS4ERR_STALE_CLIENTID: