diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-21 14:37:44 -0500 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-02-08 20:01:59 +0100 |
| commit | ca2c498b6d896b730bcf5b9a87033703d506bbdd (patch) | |
| tree | 51fa9ccb9b8ecd774a7fe0ff501d9c955a3c3fd7 /fs | |
| parent | 88bc02271ea706c54abf4237744436c5982d09bf (diff) | |
| download | lwn-ca2c498b6d896b730bcf5b9a87033703d506bbdd.tar.gz lwn-ca2c498b6d896b730bcf5b9a87033703d506bbdd.zip | |
NFSv4.1: Fix an Oops in nfs41_walk_client_list
commit 3175e1dcec40fab1a444c010087f2068b6b04732 upstream.
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
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index ce036f071302..28e1f211600d 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -629,7 +629,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); } |