lkml.org 
[lkml]   [2014]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 3/6] namespaces: expose namespace instance serial number in proc_ns_operations
    Date
    Expose the namespace instance serial number for each namespace type in the proc
    namespace operations structure to make it available for the proc filesystem.

    Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
    ---
    fs/namespace.c | 7 +++++++
    include/linux/proc_ns.h | 1 +
    ipc/namespace.c | 8 ++++++++
    kernel/pid_namespace.c | 7 +++++++
    kernel/user_namespace.c | 7 +++++++
    kernel/utsname.c | 8 ++++++++
    net/core/net_namespace.c | 7 +++++++
    7 files changed, 45 insertions(+), 0 deletions(-)

    diff --git a/fs/namespace.c b/fs/namespace.c
    index b4a31aa..69d269f 100644
    --- a/fs/namespace.c
    +++ b/fs/namespace.c
    @@ -3014,6 +3014,12 @@ static unsigned int mntns_inum(void *ns)
    return mnt_ns->proc_inum;
    }

    +static unsigned long long mntns_snum(void *ns)
    +{
    + struct mnt_namespace *mnt_ns = ns;
    + return mnt_ns->serial_num;
    +}
    +
    const struct proc_ns_operations mntns_operations = {
    .name = "mnt",
    .type = CLONE_NEWNS,
    @@ -3021,4 +3027,5 @@ const struct proc_ns_operations mntns_operations = {
    .put = mntns_put,
    .install = mntns_install,
    .inum = mntns_inum,
    + .snum = mntns_snum,
    };
    diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
    index 34a1e10..aebb3a2 100644
    --- a/include/linux/proc_ns.h
    +++ b/include/linux/proc_ns.h
    @@ -14,6 +14,7 @@ struct proc_ns_operations {
    void (*put)(void *ns);
    int (*install)(struct nsproxy *nsproxy, void *ns);
    unsigned int (*inum)(void *ns);
    + unsigned long long (*snum)(void *ns);
    };

    struct proc_ns {
    diff --git a/ipc/namespace.c b/ipc/namespace.c
    index 76dac5c..0669c2d 100644
    --- a/ipc/namespace.c
    +++ b/ipc/namespace.c
    @@ -191,6 +191,13 @@ static unsigned int ipcns_inum(void *vp)
    return ns->proc_inum;
    }

    +static unsigned long long ipcns_snum(void *vp)
    +{
    + struct ipc_namespace *ns = vp;
    +
    + return ns->serial_num;
    +}
    +
    const struct proc_ns_operations ipcns_operations = {
    .name = "ipc",
    .type = CLONE_NEWIPC,
    @@ -198,4 +205,5 @@ const struct proc_ns_operations ipcns_operations = {
    .put = ipcns_put,
    .install = ipcns_install,
    .inum = ipcns_inum,
    + .snum = ipcns_snum,
    };
    diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
    index c24f207..1dd2eb2 100644
    --- a/kernel/pid_namespace.c
    +++ b/kernel/pid_namespace.c
    @@ -368,6 +368,12 @@ static unsigned int pidns_inum(void *ns)
    return pid_ns->proc_inum;
    }

    +static unsigned long long pidns_snum(void *ns)
    +{
    + struct pid_namespace *pid_ns = ns;
    + return pid_ns->serial_num;
    +}
    +
    const struct proc_ns_operations pidns_operations = {
    .name = "pid",
    .type = CLONE_NEWPID,
    @@ -375,6 +381,7 @@ const struct proc_ns_operations pidns_operations = {
    .put = pidns_put,
    .install = pidns_install,
    .inum = pidns_inum,
    + .snum = pidns_snum,
    };

    static __init int pid_namespaces_init(void)
    diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
    index 750241c..0b1ba1c 100644
    --- a/kernel/user_namespace.c
    +++ b/kernel/user_namespace.c
    @@ -890,6 +890,12 @@ static unsigned int userns_inum(void *ns)
    return user_ns->proc_inum;
    }

    +static unsigned long long userns_snum(void *ns)
    +{
    + struct user_namespace *user_ns = ns;
    + return user_ns->serial_num;
    +}
    +
    const struct proc_ns_operations userns_operations = {
    .name = "user",
    .type = CLONE_NEWUSER,
    @@ -897,6 +903,7 @@ const struct proc_ns_operations userns_operations = {
    .put = userns_put,
    .install = userns_install,
    .inum = userns_inum,
    + .snum = userns_snum,
    };

    static __init int user_namespaces_init(void)
    diff --git a/kernel/utsname.c b/kernel/utsname.c
    index d0cf7b5..c8ca860 100644
    --- a/kernel/utsname.c
    +++ b/kernel/utsname.c
    @@ -132,6 +132,13 @@ static unsigned int utsns_inum(void *vp)
    return ns->proc_inum;
    }

    +static unsigned long long utsns_snum(void *vp)
    +{
    + struct uts_namespace *ns = vp;
    +
    + return ns->serial_num;
    +}
    +
    const struct proc_ns_operations utsns_operations = {
    .name = "uts",
    .type = CLONE_NEWUTS,
    @@ -139,4 +146,5 @@ const struct proc_ns_operations utsns_operations = {
    .put = utsns_put,
    .install = utsns_install,
    .inum = utsns_inum,
    + .snum = utsns_snum,
    };
    diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
    index e0b8528..e16dc0e 100644
    --- a/net/core/net_namespace.c
    +++ b/net/core/net_namespace.c
    @@ -667,6 +667,12 @@ static unsigned int netns_inum(void *ns)
    return net->proc_inum;
    }

    +static unsigned long long netns_snum(void *ns)
    +{
    + struct net *net = ns;
    + return net->serial_num;
    +}
    +
    const struct proc_ns_operations netns_operations = {
    .name = "net",
    .type = CLONE_NEWNET,
    @@ -674,5 +680,6 @@ const struct proc_ns_operations netns_operations = {
    .put = netns_put,
    .install = netns_install,
    .inum = netns_inum,
    + .snum = netns_snum,
    };
    #endif
    --
    1.7.1


    \
     
     \ /
      Last update: 2014-05-10 03:01    [W:3.183 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site