commit 579441a39bbbbc408acd5b228d63e76cff708fe6
author Al Viro <viro@zeniv.linux.org.uk> Mon Jul 26 13:09:36 2010 +0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Oct 29 04:16:58 2010 -0400
tree 01798eac955db70fd7f08d98e7563c261fec32a3
parent d753ed975953a4e97a356bcd59ff146919f29235

setting ->proc_mnt doesn't belong in proc_get_sb()

take that to kern_mount_data()-using callers

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

fs/proc/root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 93d99b3..03b4f6f 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -79,7 +79,6 @@
 		}
 
 		sb->s_flags |= MS_ACTIVE;
-		ns->proc_mnt = mnt;
 	}
 
 	simple_set_mnt(mnt, sb);
@@ -115,6 +114,7 @@
 		return;
 	}
 
+	init_pid_ns.proc_mnt = proc_mnt;
 	proc_symlink("mounts", NULL, "self/mounts");
 
 	proc_net_init();
@@ -213,6 +213,7 @@
 	if (IS_ERR(mnt))
 		return PTR_ERR(mnt);
 
+	ns->proc_mnt = mnt;
 	return 0;
 }