lkml.org 
[lkml]   [2008]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/12] net: assign PDE->data before gluing PDE into /proc tree
    Date
    Simply replace proc_create and further data assigned with proc_create_data.
    Additionally, there is no need to assign NULL to PDE->data after creation,
    /proc generic has already done this for us.

    Signed-off-by: Denis V. Lunev <den@openvz.org>
    Cc: Alexey Dobriyan <adobriyan@openvz.org>
    Cc: Eric W. Biederman <ebiederm@xmission.com>
    Cc: David S. Miller <davem@davemloft.net>
    ---
    net/core/neighbour.c | 5 ++---
    net/core/pktgen.c | 14 +++++---------
    2 files changed, 7 insertions(+), 12 deletions(-)

    diff --git a/net/core/neighbour.c b/net/core/neighbour.c
    index 75075c3..f4f9a63 100644
    --- a/net/core/neighbour.c
    +++ b/net/core/neighbour.c
    @@ -1430,11 +1430,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
    panic("cannot create neighbour cache statistics");

    #ifdef CONFIG_PROC_FS
    - tbl->pde = proc_create(tbl->id, 0, init_net.proc_net_stat,
    - &neigh_stat_seq_fops);
    + tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat,
    + &neigh_stat_seq_fops, tbl);
    if (!tbl->pde)
    panic("cannot create neighbour proc dir entry");
    - tbl->pde->data = tbl;
    #endif

    tbl->hash_mask = 1;
    diff --git a/net/core/pktgen.c b/net/core/pktgen.c
    index a803b44..48a48c8 100644
    --- a/net/core/pktgen.c
    +++ b/net/core/pktgen.c
    @@ -3570,15 +3570,14 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
    if (err)
    goto out1;

    - pkt_dev->entry = proc_create(ifname, 0600,
    - pg_proc_dir, &pktgen_if_fops);
    + pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir,
    + &pktgen_if_fops, pkt_dev);
    if (!pkt_dev->entry) {
    printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
    PG_PROC_DIR, ifname);
    err = -EINVAL;
    goto out2;
    }
    - pkt_dev->entry->data = pkt_dev;
    #ifdef CONFIG_XFRM
    pkt_dev->ipsmode = XFRM_MODE_TRANSPORT;
    pkt_dev->ipsproto = IPPROTO_ESP;
    @@ -3628,7 +3627,8 @@ static int __init pktgen_create_thread(int cpu)
    kthread_bind(p, cpu);
    t->tsk = p;

    - pe = proc_create(t->tsk->comm, 0600, pg_proc_dir, &pktgen_thread_fops);
    + pe = proc_create_data(t->tsk->comm, 0600, pg_proc_dir,
    + &pktgen_thread_fops, t);
    if (!pe) {
    printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
    PG_PROC_DIR, t->tsk->comm);
    @@ -3638,8 +3638,6 @@ static int __init pktgen_create_thread(int cpu)
    return -EINVAL;
    }

    - pe->data = t;
    -
    wake_up_process(p);

    return 0;
    @@ -3716,8 +3714,6 @@ static int __init pg_init(void)
    return -EINVAL;
    }

    - pe->data = NULL;
    -
    /* Register us to receive netdevice events */
    register_netdevice_notifier(&pktgen_notifier_block);

    --
    1.5.3.rc5


    \
     
     \ /
      Last update: 2008-04-29 13:19    [W:0.024 / U:65.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site