summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-25 05:43:10 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-04 07:57:01 +0400
commit0f0afb1dcf01afc44581b3c0da251ac07dfb6e4a (patch)
tree878f721ef46398d7af7f276e2f8ba9737c6dd5dd
parentb105e270b4e9419f4b9536f6862b1b32985bc9d2 (diff)
downloadlinux-0f0afb1dcf01afc44581b3c0da251ac07dfb6e4a.tar.xz
vfs: spread struct mount - change_mnt_propagation/set_mnt_shared
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namespace.c8
-rw-r--r--fs/pnode.c12
-rw-r--r--fs/pnode.h8
3 files changed, 14 insertions, 14 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,
mnt->mnt.mnt_master = old->mnt_master;
}
if (flag & CL_MAKE_SHARED)
- set_mnt_shared(&mnt->mnt);
+ set_mnt_shared(mnt);
/* stick the duplicate mount on the same expiry list
* as the original if that was on one */
@@ -1239,7 +1239,7 @@ void umount_tree(struct vfsmount *mnt, int propagate, struct list_head *kill)
p->mnt.mnt_parent->mnt_ghosts++;
dentry_reset_mounted(p->mnt.mnt_mountpoint);
}
- change_mnt_propagation(&p->mnt, MS_PRIVATE);
+ change_mnt_propagation(p, MS_PRIVATE);
}
list_splice(&tmp_list, kill);
}
@@ -1608,7 +1608,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
if (IS_MNT_SHARED(dest_mnt)) {
for (p = source_mnt; p; p = next_mnt(p, &source_mnt->mnt))
- set_mnt_shared(&p->mnt);
+ set_mnt_shared(p);
}
if (parent_path) {
detach_mnt(source_mnt, parent_path);
@@ -1723,7 +1723,7 @@ static int do_change_type(struct path *path, int flag)
br_write_lock(vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, &mnt->mnt) : NULL))
- change_mnt_propagation(&m->mnt, type);
+ change_mnt_propagation(m, type);
br_write_unlock(vfsmount_lock);
out_unlock:
diff --git a/fs/pnode.c b/fs/pnode.c
index a824a097b523..4bd3721867a7 100644
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -114,20 +114,20 @@ static int do_make_slave(struct vfsmount *mnt)
/*
* vfsmount lock must be held for write
*/
-void change_mnt_propagation(struct vfsmount *mnt, int type)
+void change_mnt_propagation(struct mount *mnt, int type)
{
if (type == MS_SHARED) {
set_mnt_shared(mnt);
return;
}
- do_make_slave(mnt);
+ do_make_slave(&mnt->mnt);
if (type != MS_SLAVE) {
- list_del_init(&mnt->mnt_slave);
- mnt->mnt_master = NULL;
+ list_del_init(&mnt->mnt.mnt_slave);
+ mnt->mnt.mnt_master = NULL;
if (type == MS_UNBINDABLE)
- mnt->mnt_flags |= MNT_UNBINDABLE;
+ mnt->mnt.mnt_flags |= MNT_UNBINDABLE;
else
- mnt->mnt_flags &= ~MNT_UNBINDABLE;
+ mnt->mnt.mnt_flags &= ~MNT_UNBINDABLE;
}
}
diff --git a/fs/pnode.h b/fs/pnode.h
index 23dfe22139da..a2ad95435c48 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -23,13 +23,13 @@
#define CL_MAKE_SHARED 0x08
#define CL_PRIVATE 0x10
-static inline void set_mnt_shared(struct vfsmount *mnt)
+static inline void set_mnt_shared(struct mount *mnt)
{
- mnt->mnt_flags &= ~MNT_SHARED_MASK;
- mnt->mnt_flags |= MNT_SHARED;
+ mnt->mnt.mnt_flags &= ~MNT_SHARED_MASK;
+ mnt->mnt.mnt_flags |= MNT_SHARED;
}
-void change_mnt_propagation(struct vfsmount *, int);
+void change_mnt_propagation(struct mount *, int);
int propagate_mnt(struct vfsmount *, struct dentry *, struct vfsmount *,
struct list_head *);
int propagate_umount(struct list_head *);