Commit 61ef47b1 authored by Al Viro's avatar Al Viro

vfs: spread struct mount - __propagate_umount() argument

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c7105365
...@@ -319,24 +319,24 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt) ...@@ -319,24 +319,24 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt)
* NOTE: unmounting 'mnt' naturally propagates to all other mounts its * NOTE: unmounting 'mnt' naturally propagates to all other mounts its
* parent propagates to. * 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; struct vfsmount *m;
BUG_ON(parent == mnt); BUG_ON(parent == &mnt->mnt);
for (m = propagation_next(parent, parent); m; for (m = propagation_next(parent, parent); m;
m = propagation_next(m, parent)) { m = propagation_next(m, parent)) {
struct mount *child = __lookup_mnt(m, struct mount *child = __lookup_mnt(m,
mnt->mnt_mountpoint, 0); mnt->mnt.mnt_mountpoint, 0);
/* /*
* umount the child only if the child has no * umount the child only if the child has no
* other children * other children
*/ */
if (child && list_empty(&child->mnt.mnt_mounts)) if (child && list_empty(&child->mnt.mnt_mounts))
list_move_tail(&child->mnt.mnt_hash, &mnt->mnt_hash); list_move_tail(&child->mnt.mnt_hash, &mnt->mnt.mnt_hash);
} }
} }
...@@ -349,9 +349,9 @@ static void __propagate_umount(struct vfsmount *mnt) ...@@ -349,9 +349,9 @@ static void __propagate_umount(struct vfsmount *mnt)
*/ */
int propagate_umount(struct list_head *list) int propagate_umount(struct list_head *list)
{ {
struct vfsmount *mnt; struct mount *mnt;
list_for_each_entry(mnt, list, mnt_hash) list_for_each_entry(mnt, list, mnt.mnt_hash)
__propagate_umount(mnt); __propagate_umount(mnt);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment