summaryrefslogtreecommitdiff
path: root/fs/ext2
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2016-05-10 19:23:55 +0300
committerVishal Verma <vishal.l.verma@intel.com>2016-05-17 09:44:12 +0300
commit284854be2b85e967d17c098a1d4c176b5cd37eb3 (patch)
treefd74304392cdee3e5bfd5de05a69599220e7ec8c /fs/ext2
parent87eefeb4e80b1526be83e670a08d059a003b7d0e (diff)
downloadlinux-284854be2b85e967d17c098a1d4c176b5cd37eb3.tar.xz
ext2: Add alignment check for DAX mount
When a partition is not aligned by 4KB, mount -o dax succeeds, but any read/write access to the filesystem fails, except for metadata update. Call bdev_dax_supported() to perform proper precondition checks which includes this partition alignment check. Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Jan Kara <jack@suse.cz> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Boaz Harrosh <boaz@plexistor.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/super.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index b78caf25f746..1d9379568aa8 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -922,16 +922,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
if (sbi->s_mount_opt & EXT2_MOUNT_DAX) {
- if (blocksize != PAGE_SIZE) {
- ext2_msg(sb, KERN_ERR,
- "error: unsupported blocksize for dax");
+ err = bdev_dax_supported(sb, blocksize);
+ if (err)
goto failed_mount;
- }
- if (!sb->s_bdev->bd_disk->fops->direct_access) {
- ext2_msg(sb, KERN_ERR,
- "error: device does not support dax");
- goto failed_mount;
- }
}
/* If the blocksize doesn't match, re-read the thing.. */