summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-06-24 13:19:53 -0400
committerIngo Molnar <mingo@kernel.org>2019-06-24 13:19:53 -0400
commitd2abae71ebcc409828b24ce9da402548ecdf1311 (patch)
tree5edfafc2828d3bcebb3698520ccba374cd4328c0 /fs/namespace.c
parent66567fcbaecac455caa1b13643155d686b51ce63 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index b26778bdc236..7660c2749c96 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2105,6 +2105,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
2105 /* Notice when we are propagating across user namespaces */ 2105 /* Notice when we are propagating across user namespaces */
2106 if (child->mnt_parent->mnt_ns->user_ns != user_ns) 2106 if (child->mnt_parent->mnt_ns->user_ns != user_ns)
2107 lock_mnt_tree(child); 2107 lock_mnt_tree(child);
2108 child->mnt.mnt_flags &= ~MNT_LOCKED;
2108 commit_tree(child); 2109 commit_tree(child);
2109 } 2110 }
2110 put_mountpoint(smp); 2111 put_mountpoint(smp);
@@ -3445,6 +3446,7 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,
3445 ns->root = mnt; 3446 ns->root = mnt;
3446 ns->mounts = 1; 3447 ns->mounts = 1;
3447 list_add(&mnt->mnt_list, &ns->list); 3448 list_add(&mnt->mnt_list, &ns->list);
3449 mntget(newmount.mnt);
3448 3450
3449 /* Attach to an apparent O_PATH fd with a note that we need to unmount 3451 /* Attach to an apparent O_PATH fd with a note that we need to unmount
3450 * it, not just simply put it. 3452 * it, not just simply put it.