commit 32301920f44a9334f57dd94bebfc6e593b99ad47
author Al Viro <viro@zeniv.linux.org.uk> Fri Nov 25 00:10:28 2011 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Tue Jan 03 22:57:08 2012 -0500
tree c8b7d1aa15244c30b5820aea30022609a12dacec
parent d10e8def07fc87488c396d2eff2c26c43bb541dd

vfs: and now we can make ->mnt_master point to struct mount

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/namespace.c

diff --git a/fs/namespace.c b/fs/namespace.c
index 3439042..847b724 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -715,7 +715,7 @@
 
 		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 @@
 	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)