From 1be6c388b36c16324b7d8da7159ee0518e3fa6c4 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 24 Nov 2011 18:25:28 -0500 Subject: [PATCH] --- yaml --- r: 280165 b: refs/heads/master c: 61ef47b1e4ba9f2b939e6772e2f96082df0ae7eb h: refs/heads/master i: 280163: d1b47cff054c69366adaa688e8e72258d9814d93 v: v3 --- [refs] | 2 +- trunk/fs/pnode.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7c18b798952d..d48c336d56f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c71053659e3bb27d44b79da0bb4abf5838c2060a +refs/heads/master: 61ef47b1e4ba9f2b939e6772e2f96082df0ae7eb diff --git a/trunk/fs/pnode.c b/trunk/fs/pnode.c index e996d039c0f2..ae5b1bda31ba 100644 --- a/trunk/fs/pnode.c +++ b/trunk/fs/pnode.c @@ -319,24 +319,24 @@ int propagate_mount_busy(struct vfsmount *mnt, int refcnt) * NOTE: unmounting 'mnt' naturally propagates to all other mounts its * 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; - BUG_ON(parent == mnt); + BUG_ON(parent == &mnt->mnt); for (m = propagation_next(parent, parent); m; m = propagation_next(m, parent)) { struct mount *child = __lookup_mnt(m, - mnt->mnt_mountpoint, 0); + mnt->mnt.mnt_mountpoint, 0); /* * umount the child only if the child has no * other children */ 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) */ 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); return 0; }