The patch titled
netns: assign PDE->data before gluing entry into /proc tree
has been removed from the -mm tree. Its filename was
netns-assign-pde-data-before-gluing-entry-into-proc-tree.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: netns: assign PDE->data before gluing entry into /proc tree
From: "Denis V. Lunev" <den@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxxx>
Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/generic.c | 17 +++++++++++++++++
fs/proc/proc_net.c | 11 -----------
2 files changed, 17 insertions(+), 11 deletions(-)
diff -puN fs/proc/generic.c~netns-assign-pde-data-before-gluing-entry-into-proc-tree fs/proc/generic.c
--- a/fs/proc/generic.c~netns-assign-pde-data-before-gluing-entry-into-proc-tree
+++ a/fs/proc/generic.c
@@ -641,6 +641,23 @@ struct proc_dir_entry *proc_mkdir_mode(c
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 -puN fs/proc/proc_net.c~netns-assign-pde-data-before-gluing-entry-into-proc-tree fs/proc/proc_net.c
--- a/fs/proc/proc_net.c~netns-assign-pde-data-before-gluing-entry-into-proc-tree
+++ a/fs/proc/proc_net.c
@@ -159,17 +159,6 @@ struct net *get_proc_net(const struct in
}
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;
_
Patches currently in -mm which might be from den@xxxxxxxxxx are
origin.patch
git-net.patch
powerpc-assign-pde-data-before-gluing-pde-into-proc-tree.patch
proc-use-non-racy-method-for-proc-page_owner-creation-page_owner.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
