vfs: spread struct mount - remaining argument of mnt_set_mountpoint()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user