---

yaml --- r: 185727 b: refs/heads/master c: 8089352 h: refs/heads/master i: 185725: 48dacd9 185723: a47c19a 185719: 1b407ef 185711: 798dcf0 185695: a5098c3 185663: 7834d4c 185599: 470f89e v: v3
git-mirror · Mar 3, 2010 · 3a939f9 · 3a939f9
1 parent 5fb4f59
commit 3a939f9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d498b25a4f877be535246c4e5b6ee5890781a477
+refs/heads/master: 8089352a13b785d4e0df63d87bd2b71c76bb9aee
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
@@ -1701,7 +1701,7 @@ int do_add_mount(struct vfsmount *newmnt, struct path *path,
 {
 	int err;
 
-	mnt_flags &= ~(MNT_SHARED | MNT_WRITE_HOLD);
+	mnt_flags &= ~(MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL);
 
 	down_write(&namespace_sem);
 	/* Something was mounted here while we slept */

diff --git a/trunk/fs/super.c b/trunk/fs/super.c
@@ -937,6 +937,9 @@ vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void
 	if (!mnt)
 		goto out;
 
+	if (flags & MS_KERNMOUNT)
+		mnt->mnt_flags = MNT_INTERNAL;
+
 	if (data && !(type->fs_flags & FS_BINARY_MOUNTDATA)) {
 		secdata = alloc_secdata();
 		if (!secdata)

diff --git a/trunk/include/linux/mount.h b/trunk/include/linux/mount.h
@@ -45,6 +45,8 @@ struct mnt_namespace;
 #define MNT_PROPAGATION_MASK	(MNT_SHARED | MNT_UNBINDABLE)
 
 
+#define MNT_INTERNAL	0x4000
+
 struct vfsmount {
 	struct list_head mnt_hash;
 	struct vfsmount *mnt_parent;	/* fs we are mounted on */