aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-03-17 13:24:34 -0400
committerMike Marshall <hubcap@omnibond.com>2016-03-17 13:24:34 -0400
commit1a0ce16d713679be86a023f7bd0f9c54f2c07e8a (patch)
tree07156d10efc9091b5f33ab2409d973bb0c355c94 /fs
parent2180c52cc72993b3b097573aaa550f273f795c8a (diff)
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)
181 * and passes along the needed info. The argument signifies 181 * and passes along the needed info. The argument signifies
182 * which time orangefs_prepare_debugfs_help_string is being 182 * which time orangefs_prepare_debugfs_help_string is being
183 * called. 183 * called.
184 *
185 */ 184 */
186 ret = orangefs_prepare_debugfs_help_string(1); 185 ret = orangefs_prepare_debugfs_help_string(1);
187 if (ret) 186 if (ret)
188 goto prepare_helpstring_failed; 187 goto cleanup_key_table;
189 188
190 ret = orangefs_debugfs_init(); 189 ret = orangefs_debugfs_init();
191 if (ret) 190 if (ret)
@@ -207,7 +206,6 @@ static int __init orangefs_init(void)
207 } 206 }
208 207
209 orangefs_sysfs_exit(); 208 orangefs_sysfs_exit();
210 fsid_key_table_finalize();
211 209
212sysfs_init_failed: 210sysfs_init_failed:
213 211
@@ -216,7 +214,8 @@ kernel_debug_init_failed:
216debugfs_init_failed: 214debugfs_init_failed:
217 orangefs_debugfs_cleanup(); 215 orangefs_debugfs_cleanup();
218 216
219prepare_helpstring_failed: 217cleanup_key_table:
218 fsid_key_table_finalize();
220 219
221cleanup_progress_table: 220cleanup_progress_table:
222 kfree(htable_ops_in_progress); 221 kfree(htable_ops_in_progress);