diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-24 21:01:32 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:02 -0500 |
commit | 1b8e5564b9d34cbeb3047dd2be8ec9cd5e2785e2 (patch) | |
tree | 61633a9593b4d1c337d7182aee2e2d2af9e9f299 /fs/pnode.c | |
parent | d5e50f74dd2ed6dd1bb4bf6fe58e5a7de4b77953 (diff) |
vfs: the first spoils - mnt_hash moved
taken out of struct vfsmount into struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pnode.c')
-rw-r--r-- | fs/pnode.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/pnode.c b/fs/pnode.c index 916c8e87cf4e..a2f0f3e0e127 100644 --- a/fs/pnode.c +++ b/fs/pnode.c | |||
@@ -247,13 +247,13 @@ int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry, | |||
247 | 247 | ||
248 | if (is_subdir(dest_dentry, m->mnt_root)) { | 248 | if (is_subdir(dest_dentry, m->mnt_root)) { |
249 | mnt_set_mountpoint(m, dest_dentry, &child->mnt); | 249 | mnt_set_mountpoint(m, dest_dentry, &child->mnt); |
250 | list_add_tail(&child->mnt.mnt_hash, tree_list); | 250 | list_add_tail(&child->mnt_hash, tree_list); |
251 | } else { | 251 | } else { |
252 | /* | 252 | /* |
253 | * This can happen if the parent mount was bind mounted | 253 | * This can happen if the parent mount was bind mounted |
254 | * on some subdirectory of a shared/slave mount. | 254 | * on some subdirectory of a shared/slave mount. |
255 | */ | 255 | */ |
256 | list_add_tail(&child->mnt.mnt_hash, &tmp_list); | 256 | list_add_tail(&child->mnt_hash, &tmp_list); |
257 | } | 257 | } |
258 | prev_dest_mnt = m; | 258 | prev_dest_mnt = m; |
259 | prev_src_mnt = &child->mnt; | 259 | prev_src_mnt = &child->mnt; |
@@ -261,7 +261,7 @@ int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry, | |||
261 | out: | 261 | out: |
262 | br_write_lock(vfsmount_lock); | 262 | br_write_lock(vfsmount_lock); |
263 | while (!list_empty(&tmp_list)) { | 263 | while (!list_empty(&tmp_list)) { |
264 | child = list_first_entry(&tmp_list, struct mount, mnt.mnt_hash); | 264 | child = list_first_entry(&tmp_list, struct mount, mnt_hash); |
265 | umount_tree(&child->mnt, 0, &umount_list); | 265 | umount_tree(&child->mnt, 0, &umount_list); |
266 | } | 266 | } |
267 | br_write_unlock(vfsmount_lock); | 267 | br_write_unlock(vfsmount_lock); |
@@ -337,7 +337,7 @@ static void __propagate_umount(struct mount *mnt) | |||
337 | * other children | 337 | * other children |
338 | */ | 338 | */ |
339 | if (child && list_empty(&child->mnt.mnt_mounts)) | 339 | if (child && list_empty(&child->mnt.mnt_mounts)) |
340 | list_move_tail(&child->mnt.mnt_hash, &mnt->mnt.mnt_hash); | 340 | list_move_tail(&child->mnt_hash, &mnt->mnt_hash); |
341 | } | 341 | } |
342 | } | 342 | } |
343 | 343 | ||
@@ -352,7 +352,7 @@ int propagate_umount(struct list_head *list) | |||
352 | { | 352 | { |
353 | struct mount *mnt; | 353 | struct mount *mnt; |
354 | 354 | ||
355 | list_for_each_entry(mnt, list, mnt.mnt_hash) | 355 | list_for_each_entry(mnt, list, mnt_hash) |
356 | __propagate_umount(mnt); | 356 | __propagate_umount(mnt); |
357 | return 0; | 357 | return 0; |
358 | } | 358 | } |