From 8df7961d8d82a0693502b0cdad2476b14b6624d0 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Sun, 8 Jan 2006 01:03:19 -0800
Subject: [PATCH] --- yaml --- r: 16970 b: refs/heads/master c:
 bf066c7db775a04bd761f8ea206f5522d0cf40ff h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/namespace.c        | 2 +-
 trunk/fs/pnode.c            | 2 +-
 trunk/include/linux/fs.h    | 2 +-
 trunk/include/linux/mount.h | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d3b8e5bdbf05..0385fc973360 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a0d11fae57989e24fe2ee3eff6d62d72db9716c
+refs/heads/master: bf066c7db775a04bd761f8ea206f5522d0cf40ff
diff --git a/trunk/fs/namespace.c b/trunk/fs/namespace.c
index e5aa1eeb5748..3e8fb61ad597 100644
--- a/trunk/fs/namespace.c
+++ b/trunk/fs/namespace.c
@@ -451,7 +451,7 @@ EXPORT_SYMBOL(may_umount);
 void release_mounts(struct list_head *head)
 {
 	struct vfsmount *mnt;
-	while(!list_empty(head)) {
+	while (!list_empty(head)) {
 		mnt = list_entry(head->next, struct vfsmount, mnt_hash);
 		list_del_init(&mnt->mnt_hash);
 		if (mnt->mnt_parent != mnt) {
diff --git a/trunk/fs/pnode.c b/trunk/fs/pnode.c
index aeeec8ba8dd2..f1871f773f64 100644
--- a/trunk/fs/pnode.c
+++ b/trunk/fs/pnode.c
@@ -103,7 +103,7 @@ static struct vfsmount *propagation_next(struct vfsmount *m,
 		struct vfsmount *next;
 		struct vfsmount *master = m->mnt_master;
 
-		if ( master == origin->mnt_master ) {
+		if (master == origin->mnt_master) {
 			next = next_peer(m);
 			return ((next == origin) ? NULL : next);
 		} else if (m->mnt_slave.next != &master->mnt_slave_list)
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 7f140480c6a8..a1e28f0895c0 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -103,11 +103,11 @@ extern int dir_notify_enable;
 #define MS_MOVE		8192
 #define MS_REC		16384
 #define MS_VERBOSE	32768
+#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
 #define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
 #define MS_PRIVATE	(1<<18)	/* change to private */
 #define MS_SLAVE	(1<<19)	/* change to slave */
 #define MS_SHARED	(1<<20)	/* change to shared */
-#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
 #define MS_ACTIVE	(1<<30)
 #define MS_NOUSER	(1<<31)
 
diff --git a/trunk/include/linux/mount.h b/trunk/include/linux/mount.h
index dd4e83eba933..b98a709f1794 100644
--- a/trunk/include/linux/mount.h
+++ b/trunk/include/linux/mount.h
@@ -22,7 +22,8 @@
 #define MNT_NOEXEC	0x04
 #define MNT_SHARED	0x10	/* if the vfsmount is a shared mount */
 #define MNT_UNBINDABLE	0x20	/* if the vfsmount is a unbindable mount */
-#define MNT_PNODE_MASK	0x30	/* propogation flag mask */
+
+#define MNT_PNODE_MASK	(MNT_SHARED | MNT_UNBINDABLE)
 
 struct vfsmount {
 	struct list_head mnt_hash;