lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vfs: spread struct mount - change_mnt_propagation/set_mnt_shared

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-11-24 20:43:10 -05:00
parent b105e270b4
commit 0f0afb1dcf
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/namespace.c
View File

@@ -724,7 +724,7 @@ static struct vfsmount *clone_mnt(struct vfsmount *old, struct dentry *root,
mnt->mnt.mnt_master = old->mnt_master; mnt->mnt.mnt_master = old->mnt_master;
} }
if (flag & CL_MAKE_SHARED) if (flag & CL_MAKE_SHARED)
set_mnt_shared(&mnt->mnt); set_mnt_shared(mnt);
/* stick the duplicate mount on the same expiry list /* stick the duplicate mount on the same expiry list
* as the original if that was on one */ * 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++; p->mnt.mnt_parent->mnt_ghosts++;
dentry_reset_mounted(p->mnt.mnt_mountpoint); 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); list_splice(&tmp_list, kill);
} }
@@ -1608,7 +1608,7 @@ static int attach_recursive_mnt(struct mount *source_mnt,
if (IS_MNT_SHARED(dest_mnt)) { if (IS_MNT_SHARED(dest_mnt)) {
for (p = source_mnt; p; p = next_mnt(p, &source_mnt->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) { if (parent_path) {
detach_mnt(source_mnt, 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); br_write_lock(vfsmount_lock);
for (m = mnt; m; m = (recurse ? next_mnt(m, &mnt->mnt) : NULL)) 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); br_write_unlock(vfsmount_lock);
out_unlock: out_unlock:

12
fs/pnode.c
View File

@@ -114,20 +114,20 @@ static int do_make_slave(struct vfsmount *mnt)
/* /*
* vfsmount lock must be held for write * 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) { if (type == MS_SHARED) {
set_mnt_shared(mnt); set_mnt_shared(mnt);
return; return;
} }
do_make_slave(mnt); do_make_slave(&mnt->mnt);
if (type != MS_SLAVE) { if (type != MS_SLAVE) {
list_del_init(&mnt->mnt_slave); list_del_init(&mnt->mnt.mnt_slave);
mnt->mnt_master = NULL; mnt->mnt.mnt_master = NULL;
if (type == MS_UNBINDABLE) if (type == MS_UNBINDABLE)
mnt->mnt_flags |= MNT_UNBINDABLE; mnt->mnt.mnt_flags |= MNT_UNBINDABLE;
else else
mnt->mnt_flags &= ~MNT_UNBINDABLE; mnt->mnt.mnt_flags &= ~MNT_UNBINDABLE;
} }
} }

8
fs/pnode.h
View File

@@ -23,13 +23,13 @@
#define CL_MAKE_SHARED 0x08 #define CL_MAKE_SHARED 0x08
#define CL_PRIVATE 0x10 #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.mnt_flags &= ~MNT_SHARED_MASK;
mnt->mnt_flags |= MNT_SHARED; 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 *, int propagate_mnt(struct vfsmount *, struct dentry *, struct vfsmount *,
struct list_head *); struct list_head *);
int propagate_umount(struct list_head *); int propagate_umount(struct list_head *);