lkml.org 
[lkml]   [2006]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 012 of 19] knfsd: lockd: Add nlm_destroy_host

    From: Olaf Kirch <okir@suse.de>

    This patch moves the host destruction code out of nlm_host_gc
    into a function of its own.

    Signed-off-by: Olaf Kirch <okir@suse.de>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./fs/lockd/host.c | 45 +++++++++++++++++++++++++++++----------------
    1 file changed, 29 insertions(+), 16 deletions(-)

    diff .prev/fs/lockd/host.c ./fs/lockd/host.c
    --- .prev/fs/lockd/host.c 2006-08-31 17:32:46.000000000 +1000
    +++ ./fs/lockd/host.c 2006-09-01 11:07:19.000000000 +1000
    @@ -164,6 +164,34 @@ out:
    return host;
    }

    +/*
    + * Destroy a host
    + */
    +static void
    +nlm_destroy_host(struct nlm_host *host)
    +{
    + struct rpc_clnt *clnt;
    +
    + BUG_ON(!list_empty(&host->h_lockowners));
    + BUG_ON(atomic_read(&host->h_count));
    +
    + /*
    + * Release NSM handle and unmonitor host.
    + */
    + nsm_unmonitor(host);
    +
    + if ((clnt = host->h_rpcclnt) != NULL) {
    + if (atomic_read(&clnt->cl_users)) {
    + printk(KERN_WARNING
    + "lockd: active RPC handle\n");
    + clnt->cl_dead = 1;
    + } else {
    + rpc_destroy_client(host->h_rpcclnt);
    + }
    + }
    + kfree(host);
    +}
    +
    struct nlm_host *
    nlm_find_client(void)
    {
    @@ -400,7 +428,6 @@ nlm_gc_hosts(void)
    struct hlist_head *chain;
    struct hlist_node *pos, *next;
    struct nlm_host *host;
    - struct rpc_clnt *clnt;

    dprintk("lockd: host garbage collection\n");
    for (chain = nlm_hosts; chain < nlm_hosts + NLM_HOST_NRHASH; ++chain) {
    @@ -423,21 +450,7 @@ nlm_gc_hosts(void)
    dprintk("lockd: delete host %s\n", host->h_name);
    hlist_del_init(&host->h_hash);

    - /*
    - * Unmonitor unless host was invalidated (i.e. lockd restarted)
    - */
    - nsm_unmonitor(host);
    -
    - if ((clnt = host->h_rpcclnt) != NULL) {
    - if (atomic_read(&clnt->cl_users)) {
    - printk(KERN_WARNING
    - "lockd: active RPC handle\n");
    - clnt->cl_dead = 1;
    - } else {
    - rpc_destroy_client(host->h_rpcclnt);
    - }
    - }
    - kfree(host);
    + nlm_destroy_host(host);
    nrhosts--;
    }
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-09-01 06:45    [W:0.025 / U:58.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site