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

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

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



Simply replace proc_create and further data assigned with proc_create_data.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7fe2336

net/ipv4/netfilter/ipt_CLUSTERIP.c

+3 −3
Original line number Diff line number Diff line
@@ -169,14 +169,14 @@ clusterip_config_init(const struct ipt_clusterip_tgt_info *i, __be32 ip, 


		/* create proc dir entry */

		sprintf(buffer, "%u.%u.%u.%u", NIPQUAD(ip));

		c->pde = proc_create(buffer, S_IWUSR|S_IRUSR,

				     clusterip_procdir, &clusterip_proc_fops);

		c->pde = proc_create_data(buffer, S_IWUSR|S_IRUSR,

					  clusterip_procdir,

					  &clusterip_proc_fops, c);

		if (!c->pde) {

			kfree(c);

			return NULL;

		}

	}

	c->pde->data = c;

#endif



	write_lock_bh(&clusterip_lock);

net/netfilter/xt_hashlimit.c

+6 −6
Original line number Diff line number Diff line
@@ -237,15 +237,15 @@ static int htable_create_v0(struct xt_hashlimit_info *minfo, int family) 
	hinfo->family = family;

	hinfo->rnd_initialized = 0;

	spin_lock_init(&hinfo->lock);

	hinfo->pde = proc_create(minfo->name, 0,

	hinfo->pde =

		proc_create_data(minfo->name, 0,

				 family == AF_INET ? hashlimit_procdir4 :

						     hashlimit_procdir6,

				 &dl_file_ops);

				 &dl_file_ops, hinfo);

	if (!hinfo->pde) {

		vfree(hinfo);

		return -1;

	}

	hinfo->pde->data = hinfo;



	setup_timer(&hinfo->timer, htable_gc, (unsigned long )hinfo);

	hinfo->timer.expires = jiffies + msecs_to_jiffies(hinfo->cfg.gc_interval);
@@ -301,15 +301,15 @@ static int htable_create(struct xt_hashlimit_mtinfo1 *minfo, 
	hinfo->rnd_initialized = 0;

	spin_lock_init(&hinfo->lock);



	hinfo->pde = proc_create(minfo->name, 0,

	hinfo->pde =

		proc_create_data(minfo->name, 0,

				 family == AF_INET ? hashlimit_procdir4 :

						     hashlimit_procdir6,

				 &dl_file_ops);

				 &dl_file_ops, hinfo);

	if (hinfo->pde == NULL) {

		vfree(hinfo);

		return -1;

	}

	hinfo->pde->data = hinfo;



	setup_timer(&hinfo->timer, htable_gc, (unsigned long)hinfo);

	hinfo->timer.expires = jiffies + msecs_to_jiffies(hinfo->cfg.gc_interval);