diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 05:09:36 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:58 -0400 |
commit | 579441a39bbbbc408acd5b228d63e76cff708fe6 (patch) | |
tree | 01798eac955db70fd7f08d98e7563c261fec32a3 /fs/proc/root.c | |
parent | d753ed975953a4e97a356bcd59ff146919f29235 (diff) |
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>
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 93d99b316325..03b4f6fe4984 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -79,7 +79,6 @@ static int proc_get_sb(struct file_system_type *fs_type, | |||
79 | } | 79 | } |
80 | 80 | ||
81 | sb->s_flags |= MS_ACTIVE; | 81 | sb->s_flags |= MS_ACTIVE; |
82 | ns->proc_mnt = mnt; | ||
83 | } | 82 | } |
84 | 83 | ||
85 | simple_set_mnt(mnt, sb); | 84 | simple_set_mnt(mnt, sb); |
@@ -115,6 +114,7 @@ void __init proc_root_init(void) | |||
115 | return; | 114 | return; |
116 | } | 115 | } |
117 | 116 | ||
117 | init_pid_ns.proc_mnt = proc_mnt; | ||
118 | proc_symlink("mounts", NULL, "self/mounts"); | 118 | proc_symlink("mounts", NULL, "self/mounts"); |
119 | 119 | ||
120 | proc_net_init(); | 120 | proc_net_init(); |
@@ -213,6 +213,7 @@ int pid_ns_prepare_proc(struct pid_namespace *ns) | |||
213 | if (IS_ERR(mnt)) | 213 | if (IS_ERR(mnt)) |
214 | return PTR_ERR(mnt); | 214 | return PTR_ERR(mnt); |
215 | 215 | ||
216 | ns->proc_mnt = mnt; | ||
216 | return 0; | 217 | return 0; |
217 | } | 218 | } |
218 | 219 | ||