diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-18 14:23:11 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-03-19 08:34:40 -0400 |
| commit | 150e7260f309fd07e853c05f7fc55b7cccb4780d (patch) | |
| tree | 0bfbd8bdf2868948359a972ee0cb475d42f353e5 /fs/nfs/nfs4state.c | |
| parent | NFSv4: Schedule recovery if nfs40_walk_client_list() is interrupted (diff) | |
| download | linux-dev-150e7260f309fd07e853c05f7fc55b7cccb4780d.tar.xz linux-dev-150e7260f309fd07e853c05f7fc55b7cccb4780d.zip | |
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>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index f544a1560c83..2349518eef2c 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -2075,8 +2075,10 @@ again: 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: |