system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: assign PDE->data before gluing PDE into /proc tree

Browse source 
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-05-02 02:46:22 -07:00 committed by David S. Miller
parent 6e79d85d9a
commit 5efdccbcda
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/core/neighbour.c
View file

@ -1430,11 +1430,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
panic("cannot create neighbour cache statistics"); panic("cannot create neighbour cache statistics");
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
tbl->pde = proc_create(tbl->id, 0, init_net.proc_net_stat, tbl->pde = proc_create_data(tbl->id, 0, init_net.proc_net_stat,
&neigh_stat_seq_fops); &neigh_stat_seq_fops, tbl);
if (!tbl->pde) if (!tbl->pde)
panic("cannot create neighbour proc dir entry"); panic("cannot create neighbour proc dir entry");
tbl->pde->data = tbl;
#endif #endif
tbl->hash_mask = 1; tbl->hash_mask = 1;

12
net/core/pktgen.c
View file

@ -3570,15 +3570,14 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)
if (err) if (err)
goto out1; goto out1;
pkt_dev->entry = proc_create(ifname, 0600, pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir,
pg_proc_dir, &pktgen_if_fops); &pktgen_if_fops, pkt_dev);
if (!pkt_dev->entry) { if (!pkt_dev->entry) {
printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n", printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
PG_PROC_DIR, ifname); PG_PROC_DIR, ifname);
err = -EINVAL; err = -EINVAL;
goto out2; goto out2;
} }
pkt_dev->entry->data = pkt_dev;
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
pkt_dev->ipsmode = XFRM_MODE_TRANSPORT; pkt_dev->ipsmode = XFRM_MODE_TRANSPORT;
pkt_dev->ipsproto = IPPROTO_ESP; pkt_dev->ipsproto = IPPROTO_ESP;
@ -3628,7 +3627,8 @@ static int __init pktgen_create_thread(int cpu)
kthread_bind(p, cpu); kthread_bind(p, cpu);
t->tsk = p; 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) { if (!pe) {
printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n", printk(KERN_ERR "pktgen: cannot create %s/%s procfs entry.\n",
PG_PROC_DIR, t->tsk->comm); PG_PROC_DIR, t->tsk->comm);
@ -3638,8 +3638,6 @@ static int __init pktgen_create_thread(int cpu)
return -EINVAL; return -EINVAL;
} }
pe->data = t;
wake_up_process(p); wake_up_process(p);
return 0; return 0;
@ -3716,8 +3714,6 @@ static int __init pg_init(void)
return -EINVAL; return -EINVAL;
} }
pe->data = NULL;
/* Register us to receive netdevice events */ /* Register us to receive netdevice events */
register_netdevice_notifier(&pktgen_notifier_block); register_netdevice_notifier(&pktgen_notifier_block);