|
@@ -3417,16 +3417,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
|
|
}
|
|
}
|
|
|
|
|
|
if (sbi->s_mount_opt & EXT4_MOUNT_DAX) {
|
|
if (sbi->s_mount_opt & EXT4_MOUNT_DAX) {
|
|
- if (blocksize != PAGE_SIZE) {
|
|
|
|
- ext4_msg(sb, KERN_ERR,
|
|
|
|
- "error: unsupported blocksize for dax");
|
|
|
|
- goto failed_mount;
|
|
|
|
- }
|
|
|
|
- if (!sb->s_bdev->bd_disk->fops->direct_access) {
|
|
|
|
- ext4_msg(sb, KERN_ERR,
|
|
|
|
- "error: device does not support dax");
|
|
|
|
|
|
+ err = bdev_dax_supported(sb, blocksize);
|
|
|
|
+ if (err)
|
|
goto failed_mount;
|
|
goto failed_mount;
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {
|
|
if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {
|