1 files changed, 8 insertions, 8 deletions

diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index b905010ca9eb..f61ae53533f5 100644
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -38,6 +38,7 @@ int proc_setup_thread_self(struct super_block *s)
         struct inode *root_inode = d_inode(s->s_root);
         struct pid_namespace *ns = proc_pid_ns(root_inode);
         struct dentry *thread_self;
+        int ret = -ENOMEM;
 
         inode_lock(root_inode);
         thread_self = d_alloc_name(s->s_root, "thread-self");
@@ -51,20 +52,19 @@ int proc_setup_thread_self(struct super_block *s)
                         inode->i_gid = GLOBAL_ROOT_GID;
                         inode->i_op = &proc_thread_self_inode_operations;
                         d_add(thread_self, inode);
+                        ret = 0;
                 } else {
                         dput(thread_self);
-                        thread_self = ERR_PTR(-ENOMEM);
                 }
-        } else {
-                thread_self = ERR_PTR(-ENOMEM);
         }
         inode_unlock(root_inode);
-        if (IS_ERR(thread_self)) {
+
+        if (ret)
                 pr_err("proc_fill_super: can't allocate /proc/thread_self\n");
-                return PTR_ERR(thread_self);
-        }
-        ns->proc_thread_self = thread_self;
-        return 0;
+        else
+                ns->proc_thread_self = thread_self;
+
+        return ret;
 }
 
 void __init proc_thread_self_init(void)