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

[PATCH 11/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 11/12] netfilter: assign PDE-&gt;data before gluing PDE into /proc tree
Date: Tuesday, April 29, 2008 - 7:13 am

Replace proc_net_fops_create 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/netfilter/x_tables.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index f52f7f8..c3aa45b 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -936,25 +936,24 @@ int xt_proto_init(struct net *net, int af)
 #ifdef CONFIG_PROC_FS
 	strlcpy(buf, xt_prefix[af], sizeof(buf));
 	strlcat(buf, FORMAT_TABLES, sizeof(buf));
-	proc = proc_net_fops_create(net, buf, 0440, &xt_table_ops);
+	proc = proc_create_data(buf, 0440, net->proc_net, &xt_table_ops,
+				(void *)(unsigned long)af);
 	if (!proc)
 		goto out;
-	proc->data = (void *)(unsigned long)af;
-
 
 	strlcpy(buf, xt_prefix[af], sizeof(buf));
 	strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-	proc = proc_net_fops_create(net, buf, 0440, &xt_match_ops);
+	proc = proc_create_data(buf, 0440, net->proc_net, &xt_match_ops,
+				(void *)(unsigned long)af);
 	if (!proc)
 		goto out_remove_tables;
-	proc->data = (void *)(unsigned long)af;
 
 	strlcpy(buf, xt_prefix[af], sizeof(buf));
 	strlcat(buf, FORMAT_TARGETS, sizeof(buf));
-	proc = proc_net_fops_create(net, buf, 0440, &xt_target_ops);
+	proc = proc_create_data(buf, 0440, net->proc_net, &xt_target_ops,
+				(void *)(unsigned long)af);
 	if (!proc)
 		goto out_remove_matches;
-	proc->data = (void *)(unsigned long)af;
 #endif
 
 	return 0;
-- 
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->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-&gt;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)