1 files changed, 6 insertions, 10 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 42f76c64df8c..dcc460537bc7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3540,10 +3540,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                 goto failed_mount;
         }
 
-#ifdef CONFIG_PROC_FS
         if (ext4_proc_root)
                 sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root);
-#endif
 
         bgl_lock_init(sbi->s_blockgroup_lock);
 
@@ -5070,13 +5068,11 @@ static int __init ext4_init_fs(void)
                 return err;
         err = ext4_init_system_zone();
         if (err)
-                goto out7;
+                goto out6;
         ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
         if (!ext4_kset)
-                goto out6;
-        ext4_proc_root = proc_mkdir("fs/ext4", NULL);
-        if (!ext4_proc_root)
                 goto out5;
+        ext4_proc_root = proc_mkdir("fs/ext4", NULL);
 
         err = ext4_init_feat_adverts();
         if (err)
@@ -5112,12 +5108,12 @@ out2:
 out3:
         ext4_exit_feat_adverts();
 out4:
-        remove_proc_entry("fs/ext4", NULL);
-out5:
+        if (ext4_proc_root)
+                remove_proc_entry("fs/ext4", NULL);
         kset_unregister(ext4_kset);
-out6:
+out5:
         ext4_exit_system_zone();
-out7:
+out6:
         ext4_exit_pageio();
         return err;
 }