summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-25 00:01:17 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:57:07 -0500
commit14cf1fa8f54353d9caf6174c1e4280c8c4dcfd7a (patch)
tree1a5fbc1f94f6d8d19492b26ab05b71e8e2d108a2
parenta8d56d8e4fa0cb9a023834363f8d79415d277a1d (diff)
vfs: spread struct mount - remaining argument of mnt_set_mountpoint()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namespace.c8
-rw-r--r--fs/pnode.c2
-rw-r--r--fs/pnode.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 8432344333da..ee42e671afdc 100644
--- 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 6519b3b4eb15..0e1de28b1b2e 100644
--- 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 55546a2f9b51..54deeda0cdb8 100644
--- 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 *);