Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / fs / pnode.c

diff --git a/fs/pnode.c b/fs/pnode.c
index aeeec8b..56aacea 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -6,7 +6,7 @@
  *     Author : Ram Pai (linuxram@us.ibm.com)
  *
  */
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 #include <linux/mount.h>
 #include <linux/fs.h>
 #include "pnode.h"
@@ -53,8 +53,7 @@ static int do_make_slave(struct vfsmount *mnt)
        if (master) {
                list_for_each_entry(slave_mnt, &mnt->mnt_slave_list, mnt_slave)
                        slave_mnt->mnt_master = master;
-               list_del(&mnt->mnt_slave);
-               list_add(&mnt->mnt_slave, &master->mnt_slave_list);
+               list_move(&mnt->mnt_slave, &master->mnt_slave_list);
                list_splice(&mnt->mnt_slave_list, master->mnt_slave_list.prev);
                INIT_LIST_HEAD(&mnt->mnt_slave_list);
        } else {
@@ -103,7 +102,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)
@@ -130,7 +129,7 @@ static struct vfsmount *get_source(struct vfsmount *dest,
 {
        struct vfsmount *p_last_src = NULL;
        struct vfsmount *p_last_dest = NULL;
-       *type = CL_PROPAGATION;;
+       *type = CL_PROPAGATION;
 
        if (IS_MNT_SHARED(dest))
                *type |= CL_MAKE_SHARED;
@@ -283,10 +282,8 @@ static void __propagate_umount(struct vfsmount *mnt)
                 * umount the child only if the child has no
                 * other children
                 */
-               if (child && list_empty(&child->mnt_mounts)) {
-                       list_del(&child->mnt_hash);
-                       list_add_tail(&child->mnt_hash, &mnt->mnt_hash);
-               }
+               if (child && list_empty(&child->mnt_mounts))
+                       list_move_tail(&child->mnt_hash, &mnt->mnt_hash);
        }
 }