lkml.org 
[lkml]   [2008]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/12] netns: assign PDE->data before gluing entry into /proc tree
    Date
    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


    \
     
     \ /
      Last update: 2008-04-29 13:17    [W:4.166 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site