diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 13:09:36 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:58 -0400 |
| commit | 579441a39bbbbc408acd5b228d63e76cff708fe6 (patch) | |
| tree | 01798eac955db70fd7f08d98e7563c261fec32a3 | |
| parent | d753ed975953a4e97a356bcd59ff146919f29235 (diff) | |
| download | linux-3.10-579441a39bbbbc408acd5b228d63e76cff708fe6.tar.gz linux-3.10-579441a39bbbbc408acd5b228d63e76cff708fe6.tar.bz2 linux-3.10-579441a39bbbbc408acd5b228d63e76cff708fe6.zip | |
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>
| -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 93d99b31632..03b4f6fe498 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, } sb->s_flags |= MS_ACTIVE; - ns->proc_mnt = mnt; } simple_set_mnt(mnt, sb); @@ -115,6 +114,7 @@ void __init proc_root_init(void) return; } + init_pid_ns.proc_mnt = proc_mnt; proc_symlink("mounts", NULL, "self/mounts"); proc_net_init(); @@ -213,6 +213,7 @@ int pid_ns_prepare_proc(struct pid_namespace *ns) if (IS_ERR(mnt)) return PTR_ERR(mnt); + ns->proc_mnt = mnt; return 0; } |