Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa0a4cf0 authored by Al Viro's avatar Al Viro
Browse files

vfs: dentry_reset_mounted() doesn't use vfsmount argument



lose it

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6c449c8d
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ static void __touch_mnt_namespace(struct mnt_namespace *ns)
 * Clear dentry's mounted state if it has no remaining mounts.
 * Clear dentry's mounted state if it has no remaining mounts.
 * vfsmount_lock must be held for write.
 * vfsmount_lock must be held for write.
 */
 */
static void dentry_reset_mounted(struct vfsmount *mnt, struct dentry *dentry)
static void dentry_reset_mounted(struct dentry *dentry)
{
{
	unsigned u;
	unsigned u;


@@ -551,7 +551,7 @@ static void detach_mnt(struct vfsmount *mnt, struct path *old_path)
	mnt->mnt_mountpoint = mnt->mnt_root;
	mnt->mnt_mountpoint = mnt->mnt_root;
	list_del_init(&mnt->mnt_child);
	list_del_init(&mnt->mnt_child);
	list_del_init(&mnt->mnt_hash);
	list_del_init(&mnt->mnt_hash);
	dentry_reset_mounted(old_path->mnt, old_path->dentry);
	dentry_reset_mounted(old_path->dentry);
}
}


/*
/*
@@ -1224,7 +1224,7 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill)
		list_del_init(&p->mnt_child);
		list_del_init(&p->mnt_child);
		if (mnt_has_parent(p)) {
		if (mnt_has_parent(p)) {
			p->mnt_parent->mnt_ghosts++;
			p->mnt_parent->mnt_ghosts++;
			dentry_reset_mounted(p->mnt_parent, p->mnt_mountpoint);
			dentry_reset_mounted(p->mnt_mountpoint);
		}
		}
		change_mnt_propagation(p, MS_PRIVATE);
		change_mnt_propagation(p, MS_PRIVATE);
	}
	}