summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/namespace.c2
-rw-r--r--kernel/nscommon.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index f0bddc9cf2a6..b2fcb901ad8c 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -4103,6 +4103,8 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns, bool a
return ERR_PTR(-ENOMEM);
}
+ if (anon)
+ new_ns->ns.inum = MNT_NS_ANON_INO;
ret = ns_common_init(&new_ns->ns, &mntns_operations, !anon);
if (ret) {
kfree(new_ns);
diff --git a/kernel/nscommon.c b/kernel/nscommon.c
index ebf4783d0505..e10fad8afe61 100644
--- a/kernel/nscommon.c
+++ b/kernel/nscommon.c
@@ -5,7 +5,7 @@
int ns_common_init(struct ns_common *ns, const struct proc_ns_operations *ops,
bool alloc_inum)
{
- if (alloc_inum) {
+ if (alloc_inum && !ns->inum) {
int ret;
ret = proc_alloc_inum(&ns->inum);
if (ret)