lkml.org 
[lkml]   [2009]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[24/30] NFSv4: Kill nfs4_renewd_prepare_shutdown()
    2.6.29-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    commit 3050141bae57984dd660e6861632ccf9b8bca77e upstream.

    The NFSv4 renew daemon is shared between all active super blocks that refer
    to a particular NFS server, so it is wrong to be shutting it down in
    nfs4_kill_super every time a super block is destroyed.

    This patch therefore kills nfs4_renewd_prepare_shutdown altogether, and
    leaves it up to nfs4_shutdown_client() to also shut down the renew daemon
    by means of the existing call to nfs4_kill_renewd().

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/nfs4renewd.c | 6 ------
    fs/nfs/super.c | 1 -
    2 files changed, 7 deletions(-)

    --- a/fs/nfs/nfs4renewd.c
    +++ b/fs/nfs/nfs4renewd.c
    @@ -125,12 +125,6 @@ nfs4_schedule_state_renewal(struct nfs_c
    }

    void
    -nfs4_renewd_prepare_shutdown(struct nfs_server *server)
    -{
    - cancel_delayed_work(&server->nfs_client->cl_renewd);
    -}
    -
    -void
    nfs4_kill_renewd(struct nfs_client *clp)
    {
    cancel_delayed_work_sync(&clp->cl_renewd);
    --- a/fs/nfs/super.c
    +++ b/fs/nfs/super.c
    @@ -2398,7 +2398,6 @@ static void nfs4_kill_super(struct super
    nfs_return_all_delegations(sb);
    kill_anon_super(sb);

    - nfs4_renewd_prepare_shutdown(server);
    nfs_free_server(server);
    }




    \
     
     \ /
      Last update: 2009-11-06 23:11    [W:0.023 / U:0.668 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site