new helpers: ns_alloc_inum/ns_free_inum
take struct ns_common *, for now simply wrappers around proc_{alloc,free}_inum() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -105,7 +105,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
|
||||
if (ns->pid_cachep == NULL)
|
||||
goto out_free_map;
|
||||
|
||||
err = proc_alloc_inum(&ns->ns.inum);
|
||||
err = ns_alloc_inum(&ns->ns);
|
||||
if (err)
|
||||
goto out_free_map;
|
||||
|
||||
@@ -142,7 +142,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
|
||||
{
|
||||
int i;
|
||||
|
||||
proc_free_inum(ns->ns.inum);
|
||||
ns_free_inum(&ns->ns);
|
||||
for (i = 0; i < PIDMAP_ENTRIES; i++)
|
||||
kfree(ns->pidmap[i].page);
|
||||
put_user_ns(ns->user_ns);
|
||||
|
@@ -86,7 +86,7 @@ int create_user_ns(struct cred *new)
|
||||
if (!ns)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = proc_alloc_inum(&ns->ns.inum);
|
||||
ret = ns_alloc_inum(&ns->ns);
|
||||
if (ret) {
|
||||
kmem_cache_free(user_ns_cachep, ns);
|
||||
return ret;
|
||||
@@ -136,7 +136,7 @@ void free_user_ns(struct user_namespace *ns)
|
||||
#ifdef CONFIG_PERSISTENT_KEYRINGS
|
||||
key_put(ns->persistent_keyring_register);
|
||||
#endif
|
||||
proc_free_inum(ns->ns.inum);
|
||||
ns_free_inum(&ns->ns);
|
||||
kmem_cache_free(user_ns_cachep, ns);
|
||||
ns = parent;
|
||||
} while (atomic_dec_and_test(&parent->count));
|
||||
|
@@ -42,7 +42,7 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
|
||||
if (!ns)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
err = proc_alloc_inum(&ns->ns.inum);
|
||||
err = ns_alloc_inum(&ns->ns);
|
||||
if (err) {
|
||||
kfree(ns);
|
||||
return ERR_PTR(err);
|
||||
@@ -84,7 +84,7 @@ void free_uts_ns(struct kref *kref)
|
||||
|
||||
ns = container_of(kref, struct uts_namespace, kref);
|
||||
put_user_ns(ns->user_ns);
|
||||
proc_free_inum(ns->ns.inum);
|
||||
ns_free_inum(&ns->ns);
|
||||
kfree(ns);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user