aboutsummaryrefslogtreecommitdiffstats
path: root/fs/pnode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-24 18:25:28 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:56:58 -0500
commit61ef47b1e4ba9f2b939e6772e2f96082df0ae7eb (patch)
tree55ac1bc3538a285a1c8e950a6af1d2fb12cae2c4 /fs/pnode.c
parentc71053659e3bb27d44b79da0bb4abf5838c2060a (diff)
vfs: spread struct mount - __propagate_umount() argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r--fs/pnode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/pnode.c b/fs/pnode.c
index e996d039c0f2..ae5b1bda31ba 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -319,24 +319,24 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt)
319 * NOTE: unmounting 'mnt' naturally propagates to all other mounts its 319 * NOTE: unmounting 'mnt' naturally propagates to all other mounts its
320 * parent propagates to. 320 * parent propagates to.
321 */ 321 */
322static void __propagate_umount(struct vfsmount *mnt) 322static void __propagate_umount(struct mount *mnt)
323{ 323{
324 struct vfsmount *parent = mnt->mnt_parent; 324 struct vfsmount *parent = mnt->mnt.mnt_parent;
325 struct vfsmount *m; 325 struct vfsmount *m;
326 326
327 BUG_ON(parent == mnt); 327 BUG_ON(parent == &mnt->mnt);
328 328
329 for (m = propagation_next(parent, parent); m; 329 for (m = propagation_next(parent, parent); m;
330 m = propagation_next(m, parent)) { 330 m = propagation_next(m, parent)) {
331 331
332 struct mount *child = __lookup_mnt(m, 332 struct mount *child = __lookup_mnt(m,
333 mnt->mnt_mountpoint, 0); 333 mnt->mnt.mnt_mountpoint, 0);
334 /* 334 /*
335 * umount the child only if the child has no 335 * umount the child only if the child has no
336 * other children 336 * other children
337 */ 337 */
338 if (child && list_empty(&child->mnt.mnt_mounts)) 338 if (child && list_empty(&child->mnt.mnt_mounts))
339 list_move_tail(&child->mnt.mnt_hash, &mnt->mnt_hash); 339 list_move_tail(&child->mnt.mnt_hash, &mnt->mnt.mnt_hash);
340 } 340 }
341} 341}
342 342
@@ -349,9 +349,9 @@ static void __propagate_umount(struct vfsmount *mnt)
349 */ 349 */
350int propagate_umount(struct list_head *list) 350int propagate_umount(struct list_head *list)
351{ 351{
352 struct vfsmount *mnt; 352 struct mount *mnt;
353 353
354 list_for_each_entry(mnt, list, mnt_hash) 354 list_for_each_entry(mnt, list, mnt.mnt_hash)
355 __propagate_umount(mnt); 355 __propagate_umount(mnt);
356 return 0; 356 return 0;
357} 357}