Merge tag 'libnvdimm-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[sfrench/cifs-2.6.git] / fs / erofs / super.c

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index e8de689c94f4cca6150bc577644241384a12e2ca..11b88559f8bfaac4a6a29b3a1aba58c3179b1c95 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -474,7 +474,7 @@ static int erofs_managed_cache_releasepage(struct page *page, gfp_t gfp_mask)
        DBG_BUGON(mapping->a_ops != &managed_cache_aops);
 
        if (PagePrivate(page))
-               ret = erofs_try_to_free_cached_page(mapping, page);
+               ret = erofs_try_to_free_cached_page(page);
 
        return ret;
 }
@@ -546,7 +546,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
                return err;
 
        if (test_opt(ctx, DAX_ALWAYS) &&
-           !bdev_dax_supported(sb->s_bdev, EROFS_BLKSIZ)) {
+           !dax_supported(sbi->dax_dev, sb->s_bdev, EROFS_BLKSIZ, 0, bdev_nr_sectors(sb->s_bdev))) {
                errorfc(fc, "DAX unsupported by block device. Turning off DAX.");
                clear_opt(ctx, DAX_ALWAYS);
        }