Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / ocfs2 / super.c

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 604e12c4e97946a1d6a65bde559402372508c6f9..68f4541c2db98b26a3aba49234c721e56d56e3c3 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -1154,19 +1154,19 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
        }
 
        status = ocfs2_mount_volume(sb);
-       if (osb->root_inode)
-               inode = igrab(osb->root_inode);
-
        if (status < 0)
                goto read_super_error;
 
+       if (osb->root_inode)
+               inode = igrab(osb->root_inode);
+
        if (!inode) {
                status = -EIO;
                mlog_errno(status);
                goto read_super_error;
        }
 
-       root = d_alloc_root(inode);
+       root = d_make_root(inode);
        if (!root) {
                status = -ENOMEM;
                mlog_errno(status);
@@ -1220,9 +1220,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
 read_super_error:
        brelse(bh);
 
-       if (inode)
-               iput(inode);
-
        if (osb) {
                atomic_set(&osb->vol_state, VOLUME_DISABLED);
                wake_up(&osb->osb_mount_event);
@@ -1627,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);
@@ -1653,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)