From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 7 Dec 2006 04:39:03 +0000 (-0800)
Subject: [PATCH] futex: init error check
X-Git-Tag: v2.6.20-rc1~145^2^2~101
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=95362fa90312ff2d52c0b4d42412cd7ceeb3b89b;p=linux-2.6-omap-h63xx.git

[PATCH] futex: init error check

Check register_filesystem() and kern_mount() return values.

Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/futex.c b/kernel/futex.c
index 7c0d0d4fa7f..d60b7f7a8cc 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1857,10 +1857,16 @@ static struct file_system_type futex_fs_type = {
 
 static int __init init(void)
 {
-	unsigned int i;
+	int i = register_filesystem(&futex_fs_type);
+
+	if (i)
+		return i;
 
-	register_filesystem(&futex_fs_type);
 	futex_mnt = kern_mount(&futex_fs_type);
+	if (IS_ERR(futex_mnt)) {
+		unregister_filesystem(&futex_fs_type);
+		return PTR_ERR(futex_mnt);
+	}
 
 	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
 		INIT_LIST_HEAD(&futex_queues[i].chain);