---

yaml --- r: 42898 b: refs/heads/master c: 95362fa h: refs/heads/master v: v3
git-mirror · Dec 7, 2006 · 040e986 · 040e986
1 parent ec9c926
commit 040e986
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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);