From 140323105ae644bcc19fb5971a625cbdee649f63 Mon Sep 17 00:00:00 2001
From: Fabrice Jouhaud <yargil@free.fr>
Date: Sat, 8 Oct 2011 16:26:03 -0400
Subject: [PATCH] --- yaml --- r: 273137 b: refs/heads/master c:
 d44651d0f922b7aaeddd9fc04f2f5700a65983dd h: refs/heads/master i:   273135:
 6685ef2cbe9fc41f5e1b3427da9e270061a9372d v: v3

---
 [refs]                |  2 +-
 trunk/fs/ext4/super.c | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index aa570ae0f532..c03183daf368 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee3b2122431fc75015c6114d4749de76422452b
+refs/heads/master: d44651d0f922b7aaeddd9fc04f2f5700a65983dd
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 42f76c64df8c..dcc460537bc7 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/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 @@ static int __init ext4_init_fs(void)
 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;
 }