Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292370
b: refs/heads/master
c: 342827d
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Mar 21, 2012
1 parent 89be31a commit f12d9e4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0794f569ec307dc25bbb12456ef75aa71f72f744
refs/heads/master: 342827d7d19cb52b562bb3efeb4d4b672d008c35
40 changes: 21 additions & 19 deletions trunk/fs/ocfs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1624,21 +1624,17 @@ static int __init ocfs2_init(void)
init_waitqueue_head(&ocfs2__ioend_wq[i]);

status = init_ocfs2_uptodate_cache();
if (status < 0) {
mlog_errno(status);
goto leave;
}
if (status < 0)
goto out1;

status = ocfs2_initialize_mem_caches();
if (status < 0) {
mlog_errno(status);
goto leave;
}
if (status < 0)
goto out2;

ocfs2_wq = create_singlethread_workqueue("ocfs2_wq");
if (!ocfs2_wq) {
status = -ENOMEM;
goto leave;
goto out3;
}

ocfs2_debugfs_root = debugfs_create_dir("ocfs2", NULL);
Expand All @@ -1650,17 +1646,23 @@ static int __init ocfs2_init(void)
ocfs2_set_locking_protocol();

status = register_quota_format(&ocfs2_quota_format);
leave:
if (status < 0) {
ocfs2_free_mem_caches();
exit_ocfs2_uptodate_cache();
mlog_errno(status);
}
if (status < 0)
goto out4;
status = register_filesystem(&ocfs2_fs_type);
if (!status)
return 0;

if (status >= 0) {
return register_filesystem(&ocfs2_fs_type);
} else
return -1;
unregister_quota_format(&ocfs2_quota_format);
out4:
destroy_workqueue(ocfs2_wq);
debugfs_remove(ocfs2_debugfs_root);
out3:
ocfs2_free_mem_caches();
out2:
exit_ocfs2_uptodate_cache();
out1:
mlog_errno(status);
return status;
}

static void __exit ocfs2_exit(void)
Expand Down

0 comments on commit f12d9e4

Please sign in to comment.