lkml.org 
[lkml]   [2008]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 6/7] proc_net: Simplify network namespace lookup.

    Since the network namespace is recorded in the
    superblock we don't need to remember it on
    each directory under /proc/net.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    fs/proc/generic.c | 17 -----------------
    fs/proc/proc_net.c | 13 ++++++++++---
    include/linux/proc_fs.h | 5 -----
    3 files changed, 10 insertions(+), 25 deletions(-)

    diff --git a/fs/proc/generic.c b/fs/proc/generic.c
    index 8669cf6..6db30a8 100644
    --- a/fs/proc/generic.c
    +++ b/fs/proc/generic.c
    @@ -658,23 +658,6 @@ 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 4a7551a..baabb9c 100644
    --- a/fs/proc/proc_net.c
    +++ b/fs/proc/proc_net.c
    @@ -31,7 +31,7 @@ static struct file_system_type proc_net_fs_type;

    static struct net *get_proc_net(const struct inode *inode)
    {
    - return maybe_get_net(PDE_NET(PDE(inode)));
    + return maybe_get_net(inode->i_sb->s_fs_info);
    }

    int seq_open_net(struct inode *ino, struct file *f,
    @@ -214,6 +214,15 @@ struct proc_dir_entry *proc_net_fops_create(struct net *net,
    }
    EXPORT_SYMBOL_GPL(proc_net_fops_create);

    +struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name,
    + struct proc_dir_entry *parent)
    +{
    + if (!parent)
    + parent = net->proc_net;
    + return proc_mkdir(name, parent);
    +}
    +EXPORT_SYMBOL_GPL(proc_net_mkdir);
    +
    void proc_net_remove(struct net *net, const char *name)
    {
    remove_proc_entry(name, net->proc_net);
    @@ -308,8 +317,6 @@ static __net_init int proc_net_ns_init(struct net *net)
    if (!netd)
    goto out;

    - netd->data = net;
    -
    err = -EEXIST;
    net_statd = proc_net_mkdir(net, "stat", netd);
    if (!net_statd)
    diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
    index 3505a72..52cc6bd 100644
    --- a/include/linux/proc_fs.h
    +++ b/include/linux/proc_fs.h
    @@ -300,11 +300,6 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode)
    return PROC_I(inode)->pde;
    }

    -static inline struct net *PDE_NET(struct proc_dir_entry *pde)
    -{
    - return pde->parent->data;
    -}
    -
    struct proc_maps_private {
    struct pid *pid;
    struct task_struct *task;
    --
    1.5.3.rc6.17.g1911


    \
     
     \ /
      Last update: 2008-11-06 12:09    [W:0.030 / U:151.804 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site