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>

parent f9b7ebdf

fs/nfs/nfs4state.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -2075,8 +2075,10 @@ int nfs4_discover_server_trunking(struct nfs_client *clp,
		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: