diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-24 23:24:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:06 -0500 |
commit | 6b41d536f7c84e7cb1c1462073150277e46f6ea8 (patch) | |
tree | fd75f1d76947bdfc42772ff3eef4b60977162840 /fs/pnode.c | |
parent | 68e8a9feab251f9d3c8fd9e9893c97843bcd4bd0 (diff) |
vfs: take mnt_child/mnt_mounts to struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 50fdb29eebfe..8cd90d2ec05e 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
@@ -303,13 +303,13 @@ int propagate_mount_busy(struct mount *mnt, int refcnt) | |||
303 | * If not, we don't have to go checking for all other | 303 | * If not, we don't have to go checking for all other |
304 | * mounts | 304 | * mounts |
305 | */ | 305 | */ |
306 | if (!list_empty(&mnt->mnt.mnt_mounts) || do_refcount_check(mnt, refcnt)) | 306 | if (!list_empty(&mnt->mnt_mounts) || do_refcount_check(mnt, refcnt)) |
307 | return 1; | 307 | return 1; |
308 | 308 | ||
309 | for (m = propagation_next(&parent->mnt, &parent->mnt); m; | 309 | for (m = propagation_next(&parent->mnt, &parent->mnt); m; |
310 | m = propagation_next(m, &parent->mnt)) { | 310 | m = propagation_next(m, &parent->mnt)) { |
311 | child = __lookup_mnt(m, mnt->mnt_mountpoint, 0); | 311 | child = __lookup_mnt(m, mnt->mnt_mountpoint, 0); |
312 | if (child && list_empty(&child->mnt.mnt_mounts) && | 312 | if (child && list_empty(&child->mnt_mounts) && |
313 | (ret = do_refcount_check(child, 1))) | 313 | (ret = do_refcount_check(child, 1))) |
314 | break; | 314 | break; |
315 | } | 315 | } |
@@ -336,7 +336,7 @@ static void __propagate_umount(struct mount *mnt) | |||
336 | * umount the child only if the child has no | 336 | * umount the child only if the child has no |
337 | * other children | 337 | * other children |
338 | */ | 338 | */ |
339 | if (child && list_empty(&child->mnt.mnt_mounts)) | 339 | if (child && list_empty(&child->mnt_mounts)) |
340 | list_move_tail(&child->mnt_hash, &mnt->mnt_hash); | 340 | list_move_tail(&child->mnt_hash, &mnt->mnt_hash); |
341 | } | 341 | } |
342 | } | 342 | } |