aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/namespace.c1
-rw-r--r--fs/pnode.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 5dc137a22d40..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);
diff --git a/fs/pnode.c b/fs/pnode.c
index 595857a1883e..49f6d7ff2139 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -261,7 +261,6 @@ static int propagate_one(struct mount *m)
261 child = copy_tree(last_source, last_source->mnt.mnt_root, type); 261 child = copy_tree(last_source, last_source->mnt.mnt_root, type);
262 if (IS_ERR(child)) 262 if (IS_ERR(child))
263 return PTR_ERR(child); 263 return PTR_ERR(child);
264 child->mnt.mnt_flags &= ~MNT_LOCKED;
265 mnt_set_mountpoint(m, mp, child); 264 mnt_set_mountpoint(m, mp, child);
266 last_dest = m; 265 last_dest = m;
267 last_source = child; 266 last_source = child;