summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-03-17 18:24:34 +0100
committerMike Marshall <hubcap@omnibond.com>2016-03-17 18:24:34 +0100
commit1a0ce16d713679be86a023f7bd0f9c54f2c07e8a (patch)
tree07156d10efc9091b5f33ab2409d973bb0c355c94 /fs
parentOrangefs: fix sloppy cleanups of debugfs and sysfs init failures. (diff)
downloadlinux-1a0ce16d713679be86a023f7bd0f9c54f2c07e8a.tar.xz
linux-1a0ce16d713679be86a023f7bd0f9c54f2c07e8a.zip
Orangefs: adjust unwind on module init failure.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/orangefs/orangefs-mod.c7
1 files changed, 3 insertions, 4 deletions
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);