Messages in this thread Patch in this message | | | Date | Sun, 4 Mar 2007 22:34:43 +0900 | From | Akinobu Mita <> | Subject | [PATCH] ocfs2: fix module_init error handling |
| |
From: Akinobu Mita <akinobu.mita@gmail.com> Subject: [PATCH] ocfs2: fix module_init error handling
Fix error handling in module_init and make module_init() return correct error code.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Mark Fasheh <mark.fasheh@oracle.com> Cc: Kurt Hackel <kurt.hackel@oracle.com> --- fs/ocfs2/super.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-)
Index: 2.6-mm/fs/ocfs2/super.c =================================================================== --- 2.6-mm.orig/fs/ocfs2/super.c +++ 2.6-mm/fs/ocfs2/super.c @@ -806,46 +806,58 @@ static int __init ocfs2_init(void) ocfs2_print_version(); - if (init_ocfs2_extent_maps()) - return -ENOMEM; + status = init_ocfs2_extent_maps(); + if (status) + goto err_extent_maps; status = init_ocfs2_uptodate_cache(); if (status < 0) { mlog_errno(status); - goto leave; + goto err_uptodate_cache; } status = ocfs2_initialize_mem_caches(); if (status < 0) { mlog_errno(status); - goto leave; + goto err_mem_caches; } ocfs2_wq = create_singlethread_workqueue("ocfs2_wq"); if (!ocfs2_wq) { status = -ENOMEM; - goto leave; + goto err_workqueue; } ocfs2_debugfs_root = debugfs_create_dir("ocfs2", NULL); if (!ocfs2_debugfs_root) { status = -EFAULT; mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n"); + goto err_debugfs; } -leave: - if (status < 0) { - ocfs2_free_mem_caches(); - exit_ocfs2_uptodate_cache(); - exit_ocfs2_extent_maps(); - } + status = register_filesystem(&ocfs2_fs_type); + if (status) + goto err_filesystem; mlog_exit(status); - if (status >= 0) { - return register_filesystem(&ocfs2_fs_type); - } else - return -1; + return 0; + +err_filesystem: + debugfs_remove(ocfs2_debugfs_root); +err_debugfs: + flush_workqueue(ocfs2_wq); + destroy_workqueue(ocfs2_wq); +err_workqueue: + ocfs2_free_mem_caches(); +err_mem_caches: + exit_ocfs2_uptodate_cache(); +err_uptodate_cache: + exit_ocfs2_extent_maps(); +err_extent_maps: + mlog_exit(status); + + return status; } static void __exit ocfs2_exit(void) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |