From c9a55d6514f41356ec9b0accf4394482d500a669 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 3 Feb 2011 14:33:49 -0500
Subject: [PATCH] --- yaml --- r: 233177 b: refs/heads/master c:
 dd68314ccf3fb918c1fb6471817edbc60ece4b52 h: refs/heads/master i:   233175:
 916799f70b0edbd6189cf2d27f1820cf68996762 v: v3

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

diff --git a/[refs] b/[refs]
index 2456695ee46c..fc5b573bb9cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f021222c1e2756ea4c9dde93b23e1d2a0a4ec37
+refs/heads/master: dd68314ccf3fb918c1fb6471817edbc60ece4b52
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 4898cb1ff606..86b05486dc63 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -4810,13 +4810,17 @@ static int __init ext4_init_fs(void)
 		return err;
 	err = ext4_init_system_zone();
 	if (err)
-		goto out5;
+		goto out7;
 	ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
 	if (!ext4_kset)
-		goto out4;
+		goto out6;
 	ext4_proc_root = proc_mkdir("fs/ext4", NULL);
+	if (!ext4_proc_root)
+		goto out5;
 
 	err = ext4_init_feat_adverts();
+	if (err)
+		goto out4;
 
 	err = ext4_init_mballoc();
 	if (err)
@@ -4847,11 +4851,13 @@ static int __init ext4_init_fs(void)
 	ext4_exit_mballoc();
 out3:
 	ext4_exit_feat_adverts();
+out4:
 	remove_proc_entry("fs/ext4", NULL);
+out5:
 	kset_unregister(ext4_kset);
-out4:
+out6:
 	ext4_exit_system_zone();
-out5:
+out7:
 	ext4_exit_pageio();
 	return err;
 }