Home » Mailing list archives » linux-kernel » 2008 » April » 29

[PATCH 2/12] netfilter: assign PDE->data before gluing PDE into /proc tree

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Denis V. Lunev <den@...>
To: <akpm@...>
Cc: <linux-kernel@...>, Denis V. Lunev <den@...>, Alexey Dobriyan <adobriyan@...>, Eric W. Biederman <ebiederm@...>, Patrick McHardy <kaber@...>
Subject: [PATCH 2/12] netfilter: assign PDE-&gt;data before gluing PDE into /proc tree
Date: Tuesday, April 29, 2008 - 7:13 am

Simply replace proc_create and further data assigned with proc_create_data.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Patrick McHardy <kaber@trash.net>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c |    6 +++---
 net/netfilter/xt_hashlimit.c       |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 22d8e7c..1819ad7 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -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);
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 40d344b..6809af5 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -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);
-- 
1.5.3.rc5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/12] Further PDE-&gt;data assignments cleanups, Denis V. Lunev, (Tue Apr 29, 7:12 am)
[PATCH 8/12] powerpc: assign PDE-&gt;data before gluing PDE ..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
[PATCH 7/12] cciss: assign PDE-&gt;data before gluing PDE in..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
RE: [PATCH 7/12] cciss: assign PDE-&gt;data before gluing PD..., Miller, Mike (OS Dev), (Tue Apr 29, 11:26 am)
[PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Stoyan Gaydarov, (Fri Jul 11, 11:12 pm)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Denis V. Lunev, (Sat Jul 12, 10:55 am)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., Eric W. Biederman, (Fri Jul 11, 11:42 pm)
Re: [PATCH 9/12] ipv4: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 7:10 am)
[PATCH 3/12] net: assign PDE-&gt;data before gluing PDE into..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 3/12] net: assign PDE-&gt;data before gluing PDE ..., David Miller, (Fri May 2, 5:46 am)
[PATCH 5/12] atm: assign PDE-&gt;data before gluing PDE into..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 5/12] atm: assign PDE-&gt;data before gluing PDE ..., David Miller, (Fri May 2, 7:08 am)
[PATCH 4/12] ipv6: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 4/12] ipv6: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 5:47 am)
[PATCH 11/12] netfilter: assign PDE-&gt;data before gluing P..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 11/12] netfilter: assign PDE-&gt;data before glui..., David Miller, (Fri May 2, 7:12 am)
Re: [PATCH 11/12] netfilter: assign PDE-&gt;data before glui..., Patrick McHardy, (Tue Apr 29, 8:01 am)
[PATCH 10/12] netfilter: assign PDE-&gt;fops before gluing P..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 10/12] netfilter: assign PDE-&gt;fops before glui..., David Miller, (Fri May 2, 7:11 am)
[PATCH 6/12] vlan: assign PDE-&gt;data before gluing PDE int..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 6/12] vlan: assign PDE-&gt;data before gluing PDE..., David Miller, (Fri May 2, 7:09 am)
[PATCH 2/12] netfilter: assign PDE->data before gluing PD..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 2/12] netfilter: assign PDE-&gt;data before gluin..., David Miller, (Fri May 2, 5:45 am)
[PATCH 12/12] netns: assign PDE-&gt;data before gluing entry..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 12/12] netns: assign PDE-&gt;data before gluing e..., David Miller, (Fri May 2, 7:12 am)
[PATCH 1/12] sunrpc: assign PDE-&gt;data before gluing PDE i..., Denis V. Lunev, (Tue Apr 29, 7:13 am)
Re: [PATCH 1/12] sunrpc: assign PDE-&gt;data before gluing P..., David Miller, (Fri May 2, 5:44 am)