---

yaml --- r: 320224 b: refs/heads/master c: 46a87b8 h: refs/heads/master v: v3
git-mirror · Jul 16, 2012 · 07d63c2 · 07d63c2
1 parent 0d9240a
commit 07d63c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a1a1e34dc55f17e7bd260809207442dbb7a0296
+refs/heads/master: 46a87b8a7b939900d779042da7097bf330ab787f
diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
@@ -258,7 +258,12 @@ static int nfs4_wait_clnt_recover(struct nfs_client *clp)
 
 	res = wait_on_bit(&clp->cl_state, NFS4CLNT_MANAGER_RUNNING,
 			nfs_wait_bit_killable, TASK_KILLABLE);
-	return res;
+	if (res)
+		return res;
+
+	if (clp->cl_cons_state < 0)
+		return clp->cl_cons_state;
+	return 0;
 }
 
 static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)