projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9b7ebd)
NFSv4: Ensure we respect soft mount timeouts during trunking discovery
authorTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 18 Mar 2014 18:23:11 +0000 (14:23 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 19 Mar 2014 12:34:40 +0000 (08:34 -0400)
Tested-by: Steve Dickson <steved@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/nfs4state.c patch | blob | blame | history

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index f544a1560c834ea99614375590279b6f396e8424..2349518eef2c28c9c74692335252b4a3877f4d22 100644 (file)
--- 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: