| From 3175e1dcec40fab1a444c010087f2068b6b04732 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Wed, 21 Jan 2015 14:37:44 -0500 |
| Subject: NFSv4.1: Fix an Oops in nfs41_walk_client_list |
| |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/nfs4client.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/nfs/nfs4client.c |
| +++ b/fs/nfs/nfs4client.c |
| @@ -640,7 +640,7 @@ int nfs41_walk_client_list(struct nfs_cl |
| 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); |
| } |
