From 040e9867eff4eb510599cc07c1449859eee7f094 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 6 Dec 2006 20:39:03 -0800
Subject: [PATCH] --- yaml --- r: 42898 b: refs/heads/master c:
 95362fa90312ff2d52c0b4d42412cd7ceeb3b89b h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/kernel/futex.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5fa31a4ddfbb..633e6a9f637b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01afb2134ed079fa4551b4d26f62423df6790c09
+refs/heads/master: 95362fa90312ff2d52c0b4d42412cd7ceeb3b89b
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 7c0d0d4fa7f7..d60b7f7a8cc3 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/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);