vfs: spread struct mount - remaining argument of mnt_set_mountpoint()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namespace.c b/fs/namespace.c
index 8432344333da52d322ec27191b1ef45ba216a782..ee42e671afdc1b8916935fa32b716461adcbb904 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -570,10 +570,10 @@ static void detach_mnt(struct mount *mnt, struct path *old_path)
 /*
  * vfsmount lock must be held for write
  */
-void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry,
+void mnt_set_mountpoint(struct mount *mnt, struct dentry *dentry,
                        struct mount *child_mnt)
 {
-       child_mnt->mnt_parent = real_mount(mntget(mnt));
+       child_mnt->mnt_parent = real_mount(mntget(&mnt->mnt));
        child_mnt->mnt_mountpoint = dget(dentry);
        spin_lock(&dentry->d_lock);
        dentry->d_flags |= DCACHE_MOUNTED;
@@ -585,7 +585,7 @@ void mnt_set_mountpoint(struct vfsmount *mnt, struct dentry *dentry,
  */
 static void attach_mnt(struct mount *mnt, struct path *path)
 {
-       mnt_set_mountpoint(path->mnt, path->dentry, mnt);
+       mnt_set_mountpoint(real_mount(path->mnt), path->dentry, mnt);
        list_add_tail(&mnt->mnt_hash, mount_hashtable +
                        hash(path->mnt, path->dentry));
        list_add_tail(&mnt->mnt_child, &real_mount(path->mnt)->mnt_mounts);
@@ -1620,7 +1620,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
                attach_mnt(source_mnt, path);
                touch_mnt_namespace(parent_path->mnt->mnt_ns);
        } else {
-               mnt_set_mountpoint(&dest_mnt->mnt, dest_dentry, source_mnt);
+               mnt_set_mountpoint(dest_mnt, dest_dentry, source_mnt);
                commit_tree(source_mnt);
        }
 

diff --git a/fs/pnode.c b/fs/pnode.c
index 6519b3b4eb155b3689136bdbff1a269537849941..0e1de28b1b2ee2a900188501a3e272272fc76637 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -244,7 +244,7 @@ int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
                }
 
                if (is_subdir(dest_dentry, m->mnt.mnt_root)) {
-                       mnt_set_mountpoint(&m->mnt, dest_dentry, child);
+                       mnt_set_mountpoint(m, dest_dentry, child);
                        list_add_tail(&child->mnt_hash, tree_list);
                } else {
                        /*

diff --git a/fs/pnode.h b/fs/pnode.h
index 55546a2f9b5134759d456054bbc66d41a9c7bc04..54deeda0cdb8880aa45cc480aa5c459c241ff738 100644 (file)
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -37,7 +37,7 @@ int propagate_mount_busy(struct mount *, int);
 void mnt_release_group_id(struct mount *);
 int get_dominating_id(struct mount *mnt, const struct path *root);
 unsigned int mnt_get_count(struct mount *mnt);
-void mnt_set_mountpoint(struct vfsmount *, struct dentry *,
+void mnt_set_mountpoint(struct mount *, struct dentry *,
                        struct mount *);
 void release_mounts(struct list_head *);
 void umount_tree(struct mount *, int, struct list_head *);