lkml.org 
[lkml]   [2015]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 34/80] NFSv4.1: Fix an Oops in nfs41_walk_client_list
    Date
    3.13.11-ckt17 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/nfs/nfs4client.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
    index 14c8af6..baa9bfb 100644
    --- a/fs/nfs/nfs4client.c
    +++ b/fs/nfs/nfs4client.c
    @@ -636,7 +636,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);
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-03-20 00:01    [W:4.025 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site