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

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

In this unfortunate case, proc_mkdir_mode wrapper can't be used anymore and
this is no way to reuse proc_create_data due to nlinks assignment. So,
copy the code from proc_mkdir and assign PDE->data at the appropriate
moment.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
---
 fs/proc/generic.c  |   17 +++++++++++++++++
 fs/proc/proc_net.c |   11 -----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 9d53b39..43e54e8 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -641,6 +641,23 @@ struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
 	return ent;
 }
 
+struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
+		struct proc_dir_entry *parent)
+{
+	struct proc_dir_entry *ent;
+
+	ent = __proc_create(&parent, name, S_IFDIR | S_IRUGO | S_IXUGO, 2);
+	if (ent) {
+		ent->data = net;
+		if (proc_register(parent, ent) < 0) {
+			kfree(ent);
+			ent = NULL;
+		}
+	}
+	return ent;
+}
+EXPORT_SYMBOL_GPL(proc_net_mkdir);
+
 struct proc_dir_entry *proc_mkdir(const char *name,
 		struct proc_dir_entry *parent)
 {
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 13cd783..83f357b 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -159,17 +159,6 @@ struct net *get_proc_net(const struct inode *inode)
 }
 EXPORT_SYMBOL_GPL(get_proc_net);
 
-struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
-		struct proc_dir_entry *parent)
-{
-	struct proc_dir_entry *pde;
-	pde = proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent);
-	if (pde != NULL)
-		pde->data = net;
-	return pde;
-}
-EXPORT_SYMBOL_GPL(proc_net_mkdir);
-
 static __net_init int proc_net_ns_init(struct net *net)
 {
 	struct proc_dir_entry *netd, *net_statd;
-- 
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-&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->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)