From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 17 Aug 2012 14:04:17 +0000 (-0400)
Subject: ext4: return an error if kset_create_and_add fails in ext4_init_fs()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0e376b1e3ccedee49cb8cc6b652fbc1e7c15eeef;p=openwrt%2Fstaging%2Fblogic.git

ext4: return an error if kset_create_and_add fails in ext4_init_fs()

In the very unlikely case that kset_create_and_add() fails when the
ext4.ko module is being loaded (or during kernel startup) set err so
that it's clear that the module load failed.

https://bugzilla.kernel.org/show_bug.cgi?id=27912

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 0423e2e7f615..3ab798d00f02 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5285,8 +5285,10 @@ static int __init ext4_init_fs(void)
 	if (err)
 		goto out6;
 	ext4_kset = kset_create_and_add("ext4", NULL, fs_kobj);
-	if (!ext4_kset)
+	if (!ext4_kset) {
+		err = -ENOMEM;
 		goto out5;
+	}
 	ext4_proc_root = proc_mkdir("fs/ext4", NULL);
 
 	err = ext4_init_feat_adverts();