Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5efdccbc authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

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



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: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e79d85d

net/core/neighbour.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

net/core/pktgen.c

+4 −8
Original line number Diff line number Diff line
@@ -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);