Merge tag 'threads-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner...

[linux-block.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 608233dfd29cf2ea59989f36a5b06441c7517e4e..2633f10446c3befc0710775a78fa340cb7224889 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -292,39 +292,3 @@ struct proc_dir_entry proc_root = {
        .subdir         = RB_ROOT,
        .name           = "/proc",
 };
-
-int pid_ns_prepare_proc(struct pid_namespace *ns)
-{
-       struct proc_fs_context *ctx;
-       struct fs_context *fc;
-       struct vfsmount *mnt;
-
-       fc = fs_context_for_mount(&proc_fs_type, SB_KERNMOUNT);
-       if (IS_ERR(fc))
-               return PTR_ERR(fc);
-
-       if (fc->user_ns != ns->user_ns) {
-               put_user_ns(fc->user_ns);
-               fc->user_ns = get_user_ns(ns->user_ns);
-       }
-
-       ctx = fc->fs_private;
-       if (ctx->pid_ns != ns) {
-               put_pid_ns(ctx->pid_ns);
-               get_pid_ns(ns);
-               ctx->pid_ns = ns;
-       }
-
-       mnt = fc_mount(fc);
-       put_fs_context(fc);
-       if (IS_ERR(mnt))
-               return PTR_ERR(mnt);
-
-       ns->proc_mnt = mnt;
-       return 0;
-}
-
-void pid_ns_release_proc(struct pid_namespace *ns)
-{
-       kern_unmount(ns->proc_mnt);
-}