summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-01-21 14:37:44 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-01-21 17:10:09 -0500
commit3175e1dcec40fab1a444c010087f2068b6b04732 (patch)
tree4e5d5142d69fc2c39b85dbc9a86ee20ce1f0dff1 /fs/nfs
parentee8a1a8b160a87dc3a9c81a86796aa4db85ea815 (diff)
downloadop-kernel-dev-3175e1dcec40fab1a444c010087f2068b6b04732.zip
op-kernel-dev-3175e1dcec40fab1a444c010087f2068b6b04732.tar.gz
NFSv4.1: Fix an Oops in nfs41_walk_client_list
If we start state recovery on a client that failed to initialise correctly, then we are very likely to Oops. Reported-by: "Mkrtchyan, Tigran" <tigran.mkrtchyan@desy.de> Link: http://lkml.kernel.org/r/130621862.279655.1421851650684.JavaMail.zimbra@desy.de Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 953daa4..706ad10 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -639,7 +639,7 @@ int nfs41_walk_client_list(struct nfs_client *new,
prev = pos;
status = nfs_wait_client_init_complete(pos);
- if (status == 0) {
+ if (pos->cl_cons_state == NFS_CS_SESSION_INITING) {
nfs4_schedule_lease_recovery(pos);
status = nfs4_wait_clnt_recover(pos);
}
OpenPOWER on IntegriCloud