diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-24 20:43:10 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:01 -0500 |
commit | 0f0afb1dcf01afc44581b3c0da251ac07dfb6e4a (patch) | |
tree | 878f721ef46398d7af7f276e2f8ba9737c6dd5dd /fs/namespace.c | |
parent | b105e270b4e9419f4b9536f6862b1b32985bc9d2 (diff) |
vfs: spread struct mount - change_mnt_propagation/set_mnt_shared
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 98b49351fbde..c7fa75f0fd92 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -724,7 +724,7 @@ static struct vfsmount *clone_mnt(struct vfsmount *old, struct dentry *root, | |||
724 | mnt->mnt.mnt_master = old->mnt_master; | 724 | mnt->mnt.mnt_master = old->mnt_master; |
725 | } | 725 | } |
726 | if (flag & CL_MAKE_SHARED) | 726 | if (flag & CL_MAKE_SHARED) |
727 | set_mnt_shared(&mnt->mnt); | 727 | set_mnt_shared(mnt); |
728 | 728 | ||
729 | /* stick the duplicate mount on the same expiry list | 729 | /* stick the duplicate mount on the same expiry list |
730 | * as the original if that was on one */ | 730 | * as the original if that was on one */ |
@@ -1239,7 +1239,7 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill) | |||
1239 | p->mnt.mnt_parent->mnt_ghosts++; | 1239 | p->mnt.mnt_parent->mnt_ghosts++; |
1240 | dentry_reset_mounted(p->mnt.mnt_mountpoint); | 1240 | dentry_reset_mounted(p->mnt.mnt_mountpoint); |
1241 | } | 1241 | } |
1242 | change_mnt_propagation(&p->mnt, MS_PRIVATE); | 1242 | change_mnt_propagation(p, MS_PRIVATE); |
1243 | } | 1243 | } |
1244 | list_splice(&tmp_list, kill); | 1244 | list_splice(&tmp_list, kill); |
1245 | } | 1245 | } |
@@ -1608,7 +1608,7 @@ static int attach_recursive_mnt(struct mount *source_mnt, | |||
1608 | 1608 | ||
1609 | if (IS_MNT_SHARED(dest_mnt)) { | 1609 | if (IS_MNT_SHARED(dest_mnt)) { |
1610 | for (p = source_mnt; p; p = next_mnt(p, &source_mnt->mnt)) | 1610 | for (p = source_mnt; p; p = next_mnt(p, &source_mnt->mnt)) |
1611 | set_mnt_shared(&p->mnt); | 1611 | set_mnt_shared(p); |
1612 | } | 1612 | } |
1613 | if (parent_path) { | 1613 | if (parent_path) { |
1614 | detach_mnt(source_mnt, parent_path); | 1614 | detach_mnt(source_mnt, parent_path); |
@@ -1723,7 +1723,7 @@ static int do_change_type(struct path *path, int flag) | |||
1723 | 1723 | ||
1724 | br_write_lock(vfsmount_lock); | 1724 | br_write_lock(vfsmount_lock); |
1725 | for (m = mnt; m; m = (recurse ? next_mnt(m, &mnt->mnt) : NULL)) | 1725 | for (m = mnt; m; m = (recurse ? next_mnt(m, &mnt->mnt) : NULL)) |
1726 | change_mnt_propagation(&m->mnt, type); | 1726 | change_mnt_propagation(m, type); |
1727 | br_write_unlock(vfsmount_lock); | 1727 | br_write_unlock(vfsmount_lock); |
1728 | 1728 | ||
1729 | out_unlock: | 1729 | out_unlock: |