1 files changed, 4 insertions, 4 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 502c61fd7392..933900909ed0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3735,9 +3735,8 @@ no_journal:
                 iput(root);
                 goto failed_mount4;
         }
-        sb->s_root = d_alloc_root(root);
+        sb->s_root = d_make_root(root);
         if (!sb->s_root) {
-                iput(root);
                 ext4_msg(sb, KERN_ERR, "get root dentry failed");
                 ret = -ENOMEM;
                 goto failed_mount4;
@@ -5056,6 +5055,9 @@ static int __init ext4_init_fs(void)
 {
         int i, err;
 
+        ext4_li_info = NULL;
+        mutex_init(&ext4_li_mtx);
+
         ext4_check_flag_values();
 
         for (i = 0; i < EXT4_WQ_HASH_SZ; i++) {
@@ -5094,8 +5096,6 @@ static int __init ext4_init_fs(void)
         if (err)
                 goto out;
 
-        ext4_li_info = NULL;
-        mutex_init(&ext4_li_mtx);
         return 0;
 out:
         unregister_as_ext2();