From: Mike Marshall <hubcap@omnibond.com>
Date: Thu, 17 Mar 2016 17:24:34 +0000 (-0400)
Subject: Orangefs: adjust unwind on module init failure.
X-Git-Tag: v4.6-rc1~2^2~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a0ce16d713679be86a023f7bd0f9c54f2c07e8a;p=karo-tx-linux.git

Orangefs: adjust unwind on module init failure.

Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---

diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index abc41fa2d2c4..76a1b9765e23 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -181,11 +181,10 @@ static int __init orangefs_init(void)
 	 * and passes along the needed info. The argument signifies
 	 * which time orangefs_prepare_debugfs_help_string is being
 	 * called.
-	 *
 	 */
 	ret = orangefs_prepare_debugfs_help_string(1);
 	if (ret)
-		goto prepare_helpstring_failed;
+		goto cleanup_key_table;
 
 	ret = orangefs_debugfs_init();
 	if (ret)
@@ -207,7 +206,6 @@ static int __init orangefs_init(void)
 	}
 
 	orangefs_sysfs_exit();
-	fsid_key_table_finalize();
 
 sysfs_init_failed:
 
@@ -216,7 +214,8 @@ kernel_debug_init_failed:
 debugfs_init_failed:
 	orangefs_debugfs_cleanup();
 
-prepare_helpstring_failed:
+cleanup_key_table:
+	fsid_key_table_finalize();
 
 cleanup_progress_table:
 	kfree(htable_ops_in_progress);