1 files changed, 6 insertions, 3 deletions

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 5dbadecb234d..6296c7626963 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -149,6 +149,8 @@ static void proc_kill_sb(struct super_block *sb)
         ns = (struct pid_namespace *)sb->s_fs_info;
         if (ns->proc_self)
                 dput(ns->proc_self);
+        if (ns->proc_thread_self)
+                dput(ns->proc_thread_self);
         kill_anon_super(sb);
         put_pid_ns(ns);
 }
@@ -170,7 +172,8 @@ void __init proc_root_init(void)
                 return;
 
         proc_self_init();
-        proc_symlink("mounts", NULL, "self/mounts");
+        proc_thread_self_init();
+        proc_symlink("mounts", NULL, "thread-self/mounts");
 
         proc_net_init();
 
@@ -199,10 +202,10 @@ static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
 
 static struct dentry *proc_root_lookup(struct inode * dir, struct dentry * dentry, unsigned int flags)
 {
-        if (!proc_lookup(dir, dentry, flags))
+        if (!proc_pid_lookup(dir, dentry, flags))
                 return NULL;
         
-        return proc_pid_lookup(dir, dentry, flags);
+        return proc_lookup(dir, dentry, flags);
 }
 
 static int proc_root_readdir(struct file *file, struct dir_context *ctx)