mnt: Add MNT_UMOUNT flag

In some instances it is necessary to know if the the unmounting
process has begun on a mount.  Add MNT_UMOUNT to make that reliably
testable.

This fix gets used in fixing locked mounts in MNT_DETACH

Cc: stable@vger.kernel.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/fs/namespace.c b/fs/namespace.c
index 54cbef129f4aa7f1dabcac41802c4c52865977cf..d1708147eb459a660acaa378d3bca7249305c4f4 100644 (file)
--- 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 bf012af709dd99ff78483d89ed90a521ea562a74..ac3aa0d43b9048b8c952f1046efa4f964254a7b8 100644 (file)
--- 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 c2c561dc011440ee83f395aba0a226ab467204a0..564beeec5d83b744fbefaf9571798b71c8c9df68 100644 (file)
--- 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 */