aboutsummaryrefslogtreecommitdiff
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-11-25 00:10:28 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:57:08 -0500
commit32301920f44a9334f57dd94bebfc6e593b99ad47 (patch)
treec8b7d1aa15244c30b5820aea30022609a12dacec /fs/namespace.c
parentd10e8def07fc87488c396d2eff2c26c43bb541dd (diff)
vfs: and now we can make ->mnt_master point to struct mount
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 3439042fc9f..847b7240c51 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -715,7 +715,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root,
if (flag & CL_SLAVE) {
list_add(&mnt->mnt.mnt_slave, &old->mnt.mnt_slave_list);
- mnt->mnt_master = &old->mnt;
+ mnt->mnt_master = old;
CLEAR_MNT_SHARED(&mnt->mnt);
} else if (!(flag & CL_PRIVATE)) {
if ((flag & CL_MAKE_SHARED) || IS_MNT_SHARED(&old->mnt))
@@ -1052,7 +1052,7 @@ static int show_mountinfo(struct seq_file *m, void *v)
if (IS_MNT_SHARED(mnt))
seq_printf(m, " shared:%i", mnt->mnt_group_id);
if (IS_MNT_SLAVE(r)) {
- int master = r->mnt_master->mnt_group_id;
+ int master = r->mnt_master->mnt.mnt_group_id;
int dom = get_dominating_id(r, &p->root);
seq_printf(m, " master:%i", master);
if (dom && dom != master)