vfs: spread struct mount - is_path_reachable

[linux-2.6-block.git] / fs / pnode.c

diff --git a/fs/pnode.c b/fs/pnode.c
index d42514e32380b5edb38f7985069efe8d8ccc80fa..25f74b53dea63fa1a3b12deee622bc3ace22e339 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -28,34 +28,19 @@ static inline struct vfsmount *next_slave(struct vfsmount *p)
        return list_entry(p->mnt_slave.next, struct vfsmount, mnt_slave);
 }
 
-/*
- * Return true if path is reachable from root
- *
- * namespace_sem is held, and mnt is attached
- */
-static bool is_path_reachable(struct vfsmount *mnt, struct dentry *dentry,
-                        const struct path *root)
-{
-       while (mnt != root->mnt && mnt->mnt_parent != mnt) {
-               dentry = mnt->mnt_mountpoint;
-               mnt = mnt->mnt_parent;
-       }
-       return mnt == root->mnt && is_subdir(dentry, root->dentry);
-}
-
 static struct vfsmount *get_peer_under_root(struct vfsmount *mnt,
                                            struct mnt_namespace *ns,
                                            const struct path *root)
 {
-       struct vfsmount *m = mnt;
+       struct mount *m = real_mount(mnt);
 
        do {
                /* Check the namespace first for optimization */
-               if (m->mnt_ns == ns && is_path_reachable(m, m->mnt_root, root))
-                       return m;
+               if (m->mnt.mnt_ns == ns && is_path_reachable(m, m->mnt.mnt_root, root))
+                       return &m->mnt;
 
-               m = next_peer(m);
-       } while (m != mnt);
+               m = real_mount(next_peer(&m->mnt));
+       } while (&m->mnt != mnt);
 
        return NULL;
 }
@@ -98,7 +83,7 @@ static int do_make_slave(struct vfsmount *mnt)
                        peer_mnt = NULL;
        }
        if (IS_MNT_SHARED(mnt) && list_empty(&mnt->mnt_share))
-               mnt_release_group_id(mnt);
+               mnt_release_group_id(real_mount(mnt));
 
        list_del_init(&mnt->mnt_share);
        mnt->mnt_group_id = 0;
@@ -129,20 +114,20 @@ static int do_make_slave(struct vfsmount *mnt)
 /*
  * vfsmount lock must be held for write
  */
-void change_mnt_propagation(struct vfsmount *mnt, int type)
+void change_mnt_propagation(struct mount *mnt, int type)
 {
        if (type == MS_SHARED) {
                set_mnt_shared(mnt);
                return;
        }
-       do_make_slave(mnt);
+       do_make_slave(&mnt->mnt);
        if (type != MS_SLAVE) {
-               list_del_init(&mnt->mnt_slave);
-               mnt->mnt_master = NULL;
+               list_del_init(&mnt->mnt.mnt_slave);
+               mnt->mnt.mnt_master = NULL;
                if (type == MS_UNBINDABLE)
-                       mnt->mnt_flags |= MNT_UNBINDABLE;
+                       mnt->mnt.mnt_flags |= MNT_UNBINDABLE;
                else
-                       mnt->mnt_flags &= ~MNT_UNBINDABLE;
+                       mnt->mnt.mnt_flags &= ~MNT_UNBINDABLE;
        }
 }
 
@@ -236,7 +221,8 @@ static struct vfsmount *get_source(struct vfsmount *dest,
 int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry,
                    struct vfsmount *source_mnt, struct list_head *tree_list)
 {
-       struct vfsmount *m, *child;
+       struct vfsmount *m;
+       struct mount *child;
        int ret = 0;
        struct vfsmount *prev_dest_mnt = dest_mnt;
        struct vfsmount *prev_src_mnt  = source_mnt;
@@ -253,7 +239,7 @@ int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry,
 
                source =  get_source(m, prev_dest_mnt, prev_src_mnt, &type);
 
-               if (!(child = copy_tree(source, source->mnt_root, type))) {
+               if (!(child = copy_tree(real_mount(source), source->mnt_root, type))) {
                        ret = -ENOMEM;
                        list_splice(tree_list, tmp_list.prev);
                        goto out;
@@ -270,12 +256,12 @@ int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry,
                        list_add_tail(&child->mnt_hash, &tmp_list);
                }
                prev_dest_mnt = m;
-               prev_src_mnt  = child;
+               prev_src_mnt  = &child->mnt;
        }
 out:
        br_write_lock(vfsmount_lock);
        while (!list_empty(&tmp_list)) {
-               child = list_first_entry(&tmp_list, struct vfsmount, mnt_hash);
+               child = list_first_entry(&tmp_list, struct mount, mnt_hash);
                umount_tree(child, 0, &umount_list);
        }
        br_write_unlock(vfsmount_lock);
@@ -286,9 +272,9 @@ out:
 /*
  * return true if the refcount is greater than count
  */
-static inline int do_refcount_check(struct vfsmount *mnt, int count)
+static inline int do_refcount_check(struct mount *mnt, int count)
 {
-       int mycount = mnt_get_count(mnt) - mnt->mnt_ghosts;
+       int mycount = mnt_get_count(&mnt->mnt) - mnt->mnt.mnt_ghosts;
        return (mycount > count);
 }
 
@@ -302,13 +288,14 @@ static inline int do_refcount_check(struct vfsmount *mnt, int count)
  *
  * vfsmount lock must be held for write
  */
-int propagate_mount_busy(struct vfsmount *mnt, int refcnt)
+int propagate_mount_busy(struct mount *mnt, int refcnt)
 {
-       struct vfsmount *m, *child;
-       struct vfsmount *parent = mnt->mnt_parent;
+       struct vfsmount *m;
+       struct mount *child;
+       struct vfsmount *parent = mnt->mnt.mnt_parent;
        int ret = 0;
 
-       if (mnt == parent)
+       if (&mnt->mnt == parent)
                return do_refcount_check(mnt, refcnt);
 
        /*
@@ -316,13 +303,13 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt)
         * If not, we don't have to go checking for all other
         * mounts
         */
-       if (!list_empty(&mnt->mnt_mounts) || do_refcount_check(mnt, refcnt))
+       if (!list_empty(&mnt->mnt.mnt_mounts) || do_refcount_check(mnt, refcnt))
                return 1;
 
        for (m = propagation_next(parent, parent); m;
                        m = propagation_next(m, parent)) {
-               child = __lookup_mnt(m, mnt->mnt_mountpoint, 0);
-               if (child && list_empty(&child->mnt_mounts) &&
+               child = __lookup_mnt(m, mnt->mnt.mnt_mountpoint, 0);
+               if (child && list_empty(&child->mnt.mnt_mounts) &&
                    (ret = do_refcount_check(child, 1)))
                        break;
        }
@@ -333,23 +320,23 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt)
  * NOTE: unmounting 'mnt' naturally propagates to all other mounts its
  * parent propagates to.
  */
-static void __propagate_umount(struct vfsmount *mnt)
+static void __propagate_umount(struct mount *mnt)
 {
-       struct vfsmount *parent = mnt->mnt_parent;
+       struct vfsmount *parent = mnt->mnt.mnt_parent;
        struct vfsmount *m;
 
-       BUG_ON(parent == mnt);
+       BUG_ON(parent == &mnt->mnt);
 
        for (m = propagation_next(parent, parent); m;
                        m = propagation_next(m, parent)) {
 
-               struct vfsmount *child = __lookup_mnt(m,
-                                       mnt->mnt_mountpoint, 0);
+               struct mount *child = __lookup_mnt(m,
+                                       mnt->mnt.mnt_mountpoint, 0);
                /*
                 * umount the child only if the child has no
                 * other children
                 */
-               if (child && list_empty(&child->mnt_mounts))
+               if (child && list_empty(&child->mnt.mnt_mounts))
                        list_move_tail(&child->mnt_hash, &mnt->mnt_hash);
        }
 }
@@ -363,7 +350,7 @@ static void __propagate_umount(struct vfsmount *mnt)
  */
 int propagate_umount(struct list_head *list)
 {
-       struct vfsmount *mnt;
+       struct mount *mnt;
 
        list_for_each_entry(mnt, list, mnt_hash)
                __propagate_umount(mnt);