summaryrefslogtreecommitdiffstats
path: root/fs/pnode.c
diff options
context:
space:
mode:
authorAl Viro2011-11-25 03:01:32 +0100
committerAl Viro2012-01-04 04:57:02 +0100
commit1b8e5564b9d34cbeb3047dd2be8ec9cd5e2785e2 (patch)
tree61633a9593b4d1c337d7182aee2e2d2af9e9f299 /fs/pnode.c
parentvfs: spread struct mount to remaining users of ->mnt_hash (diff)
downloadkernel-qcow2-linux-1b8e5564b9d34cbeb3047dd2be8ec9cd5e2785e2.tar.gz
kernel-qcow2-linux-1b8e5564b9d34cbeb3047dd2be8ec9cd5e2785e2.tar.xz
kernel-qcow2-linux-1b8e5564b9d34cbeb3047dd2be8ec9cd5e2785e2.zip
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.c10
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,
if (is_subdir(dest_dentry, m->mnt_root)) {
mnt_set_mountpoint(m, dest_dentry, &child->mnt);
- list_add_tail(&child->mnt.mnt_hash, tree_list);
+ list_add_tail(&child->mnt_hash, tree_list);
} else {
/*
* This can happen if the parent mount was bind mounted
* on some subdirectory of a shared/slave mount.
*/
- list_add_tail(&child->mnt.mnt_hash, &tmp_list);
+ list_add_tail(&child->mnt_hash, &tmp_list);
}
prev_dest_mnt = m;
prev_src_mnt = &child->mnt;
@@ -261,7 +261,7 @@ int propagate_mnt(struct vfsmount *dest_mnt, struct dentry *dest_dentry,
out:
br_write_lock(vfsmount_lock);
while (!list_empty(&tmp_list)) {
- child = list_first_entry(&tmp_list, struct mount, mnt.mnt_hash);
+ child = list_first_entry(&tmp_list, struct mount, mnt_hash);
umount_tree(&child->mnt, 0, &umount_list);
}
br_write_unlock(vfsmount_lock);
@@ -337,7 +337,7 @@ static void __propagate_umount(struct mount *mnt)
* other children
*/
if (child && list_empty(&child->mnt.mnt_mounts))
- list_move_tail(&child->mnt.mnt_hash, &mnt->mnt.mnt_hash);
+ list_move_tail(&child->mnt_hash, &mnt->mnt_hash);
}
}
@@ -352,7 +352,7 @@ int propagate_umount(struct list_head *list)
{
struct mount *mnt;
- list_for_each_entry(mnt, list, mnt.mnt_hash)
+ list_for_each_entry(mnt, list, mnt_hash)
__propagate_umount(mnt);
return 0;
}