diff options
| author | Christoph Hellwig <hch@lst.de> | 2021-11-29 11:21:42 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-12-04 08:58:51 -0800 |
| commit | 7b0800d00dae8c897398abaf61e82db0d67d7afc (patch) | |
| tree | 1d24e8995f2a54b0037b9c911c0bc9293ea6f102 /fs/erofs | |
| parent | 679a99495b8fda800037b25af8cd990eb7dd72c9 (diff) | |
| download | linux-7b0800d00dae8c897398abaf61e82db0d67d7afc.tar.gz linux-7b0800d00dae8c897398abaf61e82db0d67d7afc.tar.bz2 linux-7b0800d00dae8c897398abaf61e82db0d67d7afc.zip | |
dax: remove dax_capable
Just open code the block size and dax_dev == NULL checks in the callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> [erofs]
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20211129102203.2243509-9-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/erofs')
| -rw-r--r-- | fs/erofs/super.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 6a969b1e0ee6..0aed886473c8 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -652,10 +652,13 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (err) return err; - if (test_opt(&sbi->opt, DAX_ALWAYS) && - !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(&sbi->opt, DAX_ALWAYS); + if (test_opt(&sbi->opt, DAX_ALWAYS)) { + BUILD_BUG_ON(EROFS_BLKSIZ != PAGE_SIZE); + + if (!sbi->dax_dev) { + errorfc(fc, "DAX unsupported by block device. Turning off DAX."); + clear_opt(&sbi->opt, DAX_ALWAYS); + } } sb->s_flags |= SB_RDONLY | SB_NOATIME; sb->s_maxbytes = MAX_LFS_FILESIZE; |