diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-21 20:37:44 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-01-21 23:10:09 +0100 |
| commit | 3175e1dcec40fab1a444c010087f2068b6b04732 (patch) | |
| tree | 4e5d5142d69fc2c39b85dbc9a86ee20ce1f0dff1 /fs | |
| parent | nfs: fix dio deadlock when O_DIRECT flag is flipped (diff) | |
| download | linux-3175e1dcec40fab1a444c010087f2068b6b04732.tar.xz linux-3175e1dcec40fab1a444c010087f2068b6b04732.zip | |
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')
| -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 953daa44a282..706ad10b8186 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); } |