Skip to content

Commit

Permalink
setting ->proc_mnt doesn't belong in proc_get_sb()
Browse files Browse the repository at this point in the history
take that to kern_mount_data()-using callers

Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Oct 29, 2010
1 parent d753ed9 commit 579441a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/proc/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 579441a

Please sign in to comment.