diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-25 00:10:28 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:57:08 -0500 |
commit | 32301920f44a9334f57dd94bebfc6e593b99ad47 (patch) | |
tree | c8b7d1aa15244c30b5820aea30022609a12dacec /fs/namespace.c | |
parent | d10e8def07fc87488c396d2eff2c26c43bb541dd (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 3439042fc9f2..847b7240c512 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -715,7 +715,7 @@ static struct mount *clone_mnt(struct mount *old, struct dentry *root, | |||
715 | 715 | ||
716 | if (flag & CL_SLAVE) { | 716 | if (flag & CL_SLAVE) { |
717 | list_add(&mnt->mnt.mnt_slave, &old->mnt.mnt_slave_list); | 717 | list_add(&mnt->mnt.mnt_slave, &old->mnt.mnt_slave_list); |
718 | mnt->mnt_master = &old->mnt; | 718 | mnt->mnt_master = old; |
719 | CLEAR_MNT_SHARED(&mnt->mnt); | 719 | CLEAR_MNT_SHARED(&mnt->mnt); |
720 | } else if (!(flag & CL_PRIVATE)) { | 720 | } else if (!(flag & CL_PRIVATE)) { |
721 | if ((flag & CL_MAKE_SHARED) || IS_MNT_SHARED(&old->mnt)) | 721 | if ((flag & CL_MAKE_SHARED) || IS_MNT_SHARED(&old->mnt)) |
@@ -1052,7 +1052,7 @@ static int show_mountinfo(struct seq_file *m, void *v) | |||
1052 | if (IS_MNT_SHARED(mnt)) | 1052 | if (IS_MNT_SHARED(mnt)) |
1053 | seq_printf(m, " shared:%i", mnt->mnt_group_id); | 1053 | seq_printf(m, " shared:%i", mnt->mnt_group_id); |
1054 | if (IS_MNT_SLAVE(r)) { | 1054 | if (IS_MNT_SLAVE(r)) { |
1055 | int master = r->mnt_master->mnt_group_id; | 1055 | int master = r->mnt_master->mnt.mnt_group_id; |
1056 | int dom = get_dominating_id(r, &p->root); | 1056 | int dom = get_dominating_id(r, &p->root); |
1057 | seq_printf(m, " master:%i", master); | 1057 | seq_printf(m, " master:%i", master); |
1058 | if (dom && dom != master) | 1058 | if (dom && dom != master) |