Merge tag 'mm-stable-2022-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 8f907e9..9a66abc 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1307,7 +1307,7 @@ static void ext4_put_super(struct super_block *sb)
        if (sbi->s_chksum_driver)
                crypto_free_shash(sbi->s_chksum_driver);
        kfree(sbi->s_blockgroup_lock);
        if (sbi->s_chksum_driver)
                crypto_free_shash(sbi->s_chksum_driver);
        kfree(sbi->s_blockgroup_lock);

-       fs_put_dax(sbi->s_daxdev);
+       fs_put_dax(sbi->s_daxdev, NULL);

        fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);
 #if IS_ENABLED(CONFIG_UNICODE)
        utf8_unload(sb->s_encoding);
        fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);
 #if IS_ENABLED(CONFIG_UNICODE)
        utf8_unload(sb->s_encoding);


@@ -4281,7 +4281,7 @@ static void ext4_free_sbi(struct ext4_sb_info *sbi)
                return;
 
        kfree(sbi->s_blockgroup_lock);
                return;
 
        kfree(sbi->s_blockgroup_lock);

-       fs_put_dax(sbi->s_daxdev);
+       fs_put_dax(sbi->s_daxdev, NULL);

        kfree(sbi);
 }
 
        kfree(sbi);
 }
 


@@ -4293,7 +4293,8 @@ static struct ext4_sb_info *ext4_alloc_sbi(struct super_block *sb)
        if (!sbi)
                return NULL;
 
        if (!sbi)
                return NULL;
 

-       sbi->s_daxdev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->s_dax_part_off);
+       sbi->s_daxdev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->s_dax_part_off,
+                                          NULL, NULL);

 
        sbi->s_blockgroup_lock =
                kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);
 
        sbi->s_blockgroup_lock =
                kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);


@@ -4305,7 +4306,7 @@ static struct ext4_sb_info *ext4_alloc_sbi(struct super_block *sb)
        sbi->s_sb = sb;
        return sbi;
 err_out:
        sbi->s_sb = sb;
        return sbi;
 err_out:

-       fs_put_dax(sbi->s_daxdev);
+       fs_put_dax(sbi->s_daxdev, NULL);

        kfree(sbi);
        return NULL;
 }
        kfree(sbi);
        return NULL;
 }