3 files changed, 5 insertions, 1 deletions

diff --git a/fs/namespace.c b/fs/namespace.c
index 54cbef129f4a..d1708147eb45 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1331,8 +1331,10 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)
         struct mount *p;
 
         /* Gather the mounts to umount */
-        for (p = mnt; p; p = next_mnt(p, mnt))
+        for (p = mnt; p; p = next_mnt(p, mnt)) {
+                p->mnt.mnt_flags |= MNT_UMOUNT;
                 list_move(&p->mnt_list, &tmp_list);
+        }
 
         /* Hide the mounts from lookup_mnt and mnt_mounts */
         list_for_each_entry(p, &tmp_list, mnt_list) {
diff --git a/fs/pnode.c b/fs/pnode.c
index bf012af709dd..ac3aa0d43b90 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -384,6 +384,7 @@ static void __propagate_umount(struct mount *mnt)
                 if (child && list_empty(&child->mnt_mounts)) {
                         list_del_init(&child->mnt_child);
                         hlist_del_init_rcu(&child->mnt_hash);
+                        child->mnt.mnt_flags |= MNT_UMOUNT;
                         list_move_tail(&child->mnt_list, &mnt->mnt_list);
                 }
         }
diff --git a/include/linux/mount.h b/include/linux/mount.h
index c2c561dc0114..564beeec5d83 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -61,6 +61,7 @@ struct mnt_namespace;
 #define MNT_DOOMED              0x1000000
 #define MNT_SYNC_UMOUNT         0x2000000
 #define MNT_MARKED              0x4000000
+#define MNT_UMOUNT              0x8000000
 
 struct vfsmount {
         struct dentry *mnt_root;        /* root of the mounted tree */