UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

common object embedded into various struct ....ns 

for now - just move corresponding ->proc_inum instances over there

Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-10-31 22:56:04 -04:00
parent cac7f24298
commit 435d5f4bb2
17 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/mount.h
View File

@ -1,10 +1,11 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/ns_common.h>
struct mnt_namespace { struct mnt_namespace {
atomic_t count; atomic_t count;
unsigned int proc_inum; struct ns_common ns;
struct mount * root; struct mount * root;
struct list_head list; struct list_head list;
struct user_namespace *user_ns; struct user_namespace *user_ns;

6
fs/namespace.c
View File

@ -2640,7 +2640,7 @@ dput_out:
static void free_mnt_ns(struct mnt_namespace *ns) static void free_mnt_ns(struct mnt_namespace *ns)
{ {
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
put_user_ns(ns->user_ns); put_user_ns(ns->user_ns);
kfree(ns); kfree(ns);
} }
@ -2662,7 +2662,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL); new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL);
if (!new_ns) if (!new_ns)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ret = proc_alloc_inum(&new_ns->proc_inum); ret = proc_alloc_inum(&new_ns->ns.inum);
if (ret) { if (ret) {
kfree(new_ns); kfree(new_ns);
return ERR_PTR(ret); return ERR_PTR(ret);
@ -3201,7 +3201,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int mntns_inum(void *ns) static unsigned int mntns_inum(void *ns)
{ {
struct mnt_namespace *mnt_ns = ns; struct mnt_namespace *mnt_ns = ns;
return mnt_ns->proc_inum; return mnt_ns->ns.inum;
} }
const struct proc_ns_operations mntns_operations = { const struct proc_ns_operations mntns_operations = {

3
include/linux/ipc_namespace.h
View File

@ -6,6 +6,7 @@
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/ns_common.h>
/* /*
* ipc namespace events * ipc namespace events
@ -68,7 +69,7 @@ struct ipc_namespace {
/* user_ns which owns the ipc ns */ /* user_ns which owns the ipc ns */
struct user_namespace *user_ns; struct user_namespace *user_ns;
unsigned int proc_inum; struct ns_common ns;
}; };
extern struct ipc_namespace init_ipc_ns; extern struct ipc_namespace init_ipc_ns;

8
include/linux/ns_common.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef _LINUX_NS_COMMON_H
#define _LINUX_NS_COMMON_H
struct ns_common {
unsigned int inum;
};
#endif

3
include/linux/pid_namespace.h
View File

@ -8,6 +8,7 @@
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/ns_common.h>
struct pidmap { struct pidmap {
atomic_t nr_free; atomic_t nr_free;
@ -43,7 +44,7 @@ struct pid_namespace {
kgid_t pid_gid; kgid_t pid_gid;
int hide_pid; int hide_pid;
int reboot; /* group exit code if this pidns was rebooted */ int reboot; /* group exit code if this pidns was rebooted */
unsigned int proc_inum; struct ns_common ns;
}; };
extern struct pid_namespace init_pid_ns; extern struct pid_namespace init_pid_ns;

3
include/linux/user_namespace.h
View File

@ -3,6 +3,7 @@
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/ns_common.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/err.h> #include <linux/err.h>
@ -26,7 +27,7 @@ struct user_namespace {
int level; int level;
kuid_t owner; kuid_t owner;
kgid_t group; kgid_t group;
unsigned int proc_inum; struct ns_common ns;
/* Register of per-UID persistent keyrings for this namespace */ /* Register of per-UID persistent keyrings for this namespace */
#ifdef CONFIG_PERSISTENT_KEYRINGS #ifdef CONFIG_PERSISTENT_KEYRINGS

3
include/linux/utsname.h
View File

@ -5,6 +5,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <linux/ns_common.h>
#include <linux/err.h> #include <linux/err.h>
#include <uapi/linux/utsname.h> #include <uapi/linux/utsname.h>
@ -23,7 +24,7 @@ struct uts_namespace {
struct kref kref; struct kref kref;
struct new_utsname name; struct new_utsname name;
struct user_namespace *user_ns; struct user_namespace *user_ns;
unsigned int proc_inum; struct ns_common ns;
}; };
extern struct uts_namespace init_uts_ns; extern struct uts_namespace init_uts_ns;

3
include/net/net_namespace.h
View File

@ -26,6 +26,7 @@
#endif #endif
#include <net/netns/nftables.h> #include <net/netns/nftables.h>
#include <net/netns/xfrm.h> #include <net/netns/xfrm.h>
#include <linux/ns_common.h>
struct user_namespace; struct user_namespace;
struct proc_dir_entry; struct proc_dir_entry;
@ -60,7 +61,7 @@ struct net {
struct user_namespace *user_ns; /* Owning user namespace */ struct user_namespace *user_ns; /* Owning user namespace */
unsigned int proc_inum; struct ns_common ns;
struct proc_dir_entry *proc_net; struct proc_dir_entry *proc_net;
struct proc_dir_entry *proc_net_stat; struct proc_dir_entry *proc_net_stat;

2
init/version.c
View File

@ -35,7 +35,7 @@ struct uts_namespace init_uts_ns = {
.domainname = UTS_DOMAINNAME, .domainname = UTS_DOMAINNAME,
}, },
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.proc_inum = PROC_UTS_INIT_INO, .ns.inum = PROC_UTS_INIT_INO,
}; };
EXPORT_SYMBOL_GPL(init_uts_ns); EXPORT_SYMBOL_GPL(init_uts_ns);

2
ipc/msgutil.c
View File

@ -31,7 +31,7 @@ DEFINE_SPINLOCK(mq_lock);
struct ipc_namespace init_ipc_ns = { struct ipc_namespace init_ipc_ns = {
.count = ATOMIC_INIT(1), .count = ATOMIC_INIT(1),
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.proc_inum = PROC_IPC_INIT_INO, .ns.inum = PROC_IPC_INIT_INO,
}; };
atomic_t nr_ipc_ns = ATOMIC_INIT(1); atomic_t nr_ipc_ns = ATOMIC_INIT(1);

8
ipc/namespace.c
View File

@ -26,7 +26,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
if (ns == NULL) if (ns == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
err = proc_alloc_inum(&ns->proc_inum); err = proc_alloc_inum(&ns->ns.inum);
if (err) { if (err) {
kfree(ns); kfree(ns);
return ERR_PTR(err); return ERR_PTR(err);
@ -35,7 +35,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
atomic_set(&ns->count, 1); atomic_set(&ns->count, 1);
err = mq_init_ns(ns); err = mq_init_ns(ns);
if (err) { if (err) {
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
kfree(ns); kfree(ns);
return ERR_PTR(err); return ERR_PTR(err);
} }
@ -119,7 +119,7 @@ static void free_ipc_ns(struct ipc_namespace *ns)
*/ */
ipcns_notify(IPCNS_REMOVED); ipcns_notify(IPCNS_REMOVED);
put_user_ns(ns->user_ns); put_user_ns(ns->user_ns);
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
kfree(ns); kfree(ns);
} }
@ -186,7 +186,7 @@ static unsigned int ipcns_inum(void *vp)
{ {
struct ipc_namespace *ns = vp; struct ipc_namespace *ns = vp;
return ns->proc_inum; return ns->ns.inum;
} }
const struct proc_ns_operations ipcns_operations = { const struct proc_ns_operations ipcns_operations = {

2
kernel/pid.c
View File

@ -79,7 +79,7 @@ struct pid_namespace init_pid_ns = {
.level = 0, .level = 0,
.child_reaper = &init_task, .child_reaper = &init_task,
.user_ns = &init_user_ns, .user_ns = &init_user_ns,
.proc_inum = PROC_PID_INIT_INO, .ns.inum = PROC_PID_INIT_INO,
}; };
EXPORT_SYMBOL_GPL(init_pid_ns); EXPORT_SYMBOL_GPL(init_pid_ns);

6
kernel/pid_namespace.c
View File

@ -105,7 +105,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
if (ns->pid_cachep == NULL) if (ns->pid_cachep == NULL)
goto out_free_map; goto out_free_map;
err = proc_alloc_inum(&ns->proc_inum); err = proc_alloc_inum(&ns->ns.inum);
if (err) if (err)
goto out_free_map; goto out_free_map;
@ -142,7 +142,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
{ {
int i; int i;
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
for (i = 0; i < PIDMAP_ENTRIES; i++) for (i = 0; i < PIDMAP_ENTRIES; i++)
kfree(ns->pidmap[i].page); kfree(ns->pidmap[i].page);
put_user_ns(ns->user_ns); put_user_ns(ns->user_ns);
@ -365,7 +365,7 @@ static int pidns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int pidns_inum(void *ns) static unsigned int pidns_inum(void *ns)
{ {
struct pid_namespace *pid_ns = ns; struct pid_namespace *pid_ns = ns;
return pid_ns->proc_inum; return pid_ns->ns.inum;
} }
const struct proc_ns_operations pidns_operations = { const struct proc_ns_operations pidns_operations = {

2
kernel/user.c
View File

@ -50,7 +50,7 @@ struct user_namespace init_user_ns = {
.count = ATOMIC_INIT(3), .count = ATOMIC_INIT(3),
.owner = GLOBAL_ROOT_UID, .owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID, .group = GLOBAL_ROOT_GID,
.proc_inum = PROC_USER_INIT_INO, .ns.inum = PROC_USER_INIT_INO,
#ifdef CONFIG_PERSISTENT_KEYRINGS #ifdef CONFIG_PERSISTENT_KEYRINGS
.persistent_keyring_register_sem = .persistent_keyring_register_sem =
__RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem), __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),

6
kernel/user_namespace.c
View File

@ -86,7 +86,7 @@ int create_user_ns(struct cred *new)
if (!ns) if (!ns)
return -ENOMEM; return -ENOMEM;
ret = proc_alloc_inum(&ns->proc_inum); ret = proc_alloc_inum(&ns->ns.inum);
if (ret) { if (ret) {
kmem_cache_free(user_ns_cachep, ns); kmem_cache_free(user_ns_cachep, ns);
return ret; return ret;
@ -136,7 +136,7 @@ void free_user_ns(struct user_namespace *ns)
#ifdef CONFIG_PERSISTENT_KEYRINGS #ifdef CONFIG_PERSISTENT_KEYRINGS
key_put(ns->persistent_keyring_register); key_put(ns->persistent_keyring_register);
#endif #endif
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
kmem_cache_free(user_ns_cachep, ns); kmem_cache_free(user_ns_cachep, ns);
ns = parent; ns = parent;
} while (atomic_dec_and_test(&parent->count)); } while (atomic_dec_and_test(&parent->count));
@ -891,7 +891,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int userns_inum(void *ns) static unsigned int userns_inum(void *ns)
{ {
struct user_namespace *user_ns = ns; struct user_namespace *user_ns = ns;
return user_ns->proc_inum; return user_ns->ns.inum;
} }
const struct proc_ns_operations userns_operations = { const struct proc_ns_operations userns_operations = {

6
kernel/utsname.c
View File

@ -42,7 +42,7 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
if (!ns) if (!ns)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
err = proc_alloc_inum(&ns->proc_inum); err = proc_alloc_inum(&ns->ns.inum);
if (err) { if (err) {
kfree(ns); kfree(ns);
return ERR_PTR(err); return ERR_PTR(err);
@ -84,7 +84,7 @@ void free_uts_ns(struct kref *kref)
ns = container_of(kref, struct uts_namespace, kref); ns = container_of(kref, struct uts_namespace, kref);
put_user_ns(ns->user_ns); put_user_ns(ns->user_ns);
proc_free_inum(ns->proc_inum); proc_free_inum(ns->ns.inum);
kfree(ns); kfree(ns);
} }
@ -127,7 +127,7 @@ static unsigned int utsns_inum(void *vp)
{ {
struct uts_namespace *ns = vp; struct uts_namespace *ns = vp;
return ns->proc_inum; return ns->ns.inum;
} }
const struct proc_ns_operations utsns_operations = { const struct proc_ns_operations utsns_operations = {

6
net/core/net_namespace.c
View File

@ -386,12 +386,12 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
static __net_init int net_ns_net_init(struct net *net) static __net_init int net_ns_net_init(struct net *net)
{ {
return proc_alloc_inum(&net->proc_inum); return proc_alloc_inum(&net->ns.inum);
} }
static __net_exit void net_ns_net_exit(struct net *net) static __net_exit void net_ns_net_exit(struct net *net)
{ {
proc_free_inum(net->proc_inum); proc_free_inum(net->ns.inum);
} }
static struct pernet_operations __net_initdata net_ns_ops = { static struct pernet_operations __net_initdata net_ns_ops = {
@ -664,7 +664,7 @@ static int netns_install(struct nsproxy *nsproxy, void *ns)
static unsigned int netns_inum(void *ns) static unsigned int netns_inum(void *ns)
{ {
struct net *net = ns; struct net *net = ns;
return net->proc_inum; return net->ns.inum;
} }
const struct proc_ns_operations netns_operations = { const struct proc_ns_operations netns_operations = {