Skip to content

Commit

Permalink
netns: assign PDE->data before gluing entry into /proc tree
Browse files Browse the repository at this point in the history
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed May 2, 2008
1 parent 8b16924 commit 78e92b9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
17 changes: 17 additions & 0 deletions fs/proc/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
11 changes: 0 additions & 11 deletions fs/proc/proc_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 78e92b9

Please sign in to comment.