[PATCH] shared mounts: cleanup

Small cleanups in shared mounts code.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: Ram Pai <linuxram@us.ibm.com>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/namespace.c b/fs/namespace.c
index e5aa1eeb574825c5e8b63da41291e7e0d96b2fc6..3e8fb61ad597cfd90164bf40aefdf0a761a02a13 100644 (file)
--- a/fs/namespace.c
+++ b/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/fs/pnode.c b/fs/pnode.c
index aeeec8ba8dd28b9ac4a77ee513fb23423b55d458..f1871f773f642c8f39045431f5e42134e93ea80f 100644 (file)
--- a/fs/pnode.c
+++ b/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/include/linux/fs.h b/include/linux/fs.h
index 7f140480c6a83f1cd6ec47d866239b6182d19afa..a1e28f0895c01e212985a28e08f59d17469fac5e 100644 (file)
--- a/include/linux/fs.h
+++ b/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/include/linux/mount.h b/include/linux/mount.h
index dd4e83eba933a3f345e55077b745afb7975c853a..b98a709f179406e1fec94a3679eb9184cb8f98e3 100644 (file)
--- a/include/linux/mount.h
+++ b/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;