aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2016-05-10 12:23:54 -0400
committerVishal Verma <vishal.l.verma@intel.com>2016-05-17 02:44:11 -0400
commit87eefeb4e80b1526be83e670a08d059a003b7d0e (patch)
treea88b87b6b1b30d24fd83a61ba52510ca1d81b25f /fs
parent2d96afc8f70ef86c66a0b5d80c24a27d6dd13df3 (diff)
ext4: 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. Reported-by: Micah Parrish <micah.parrish@hpe.com> Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Andreas Dilger <adilger.kernel@dilger.ca> 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')
-rw-r--r--fs/ext4/super.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 20c5d52253b4..3822a5aedc61 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3417,16 +3417,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3417 } 3417 }
3418 3418
3419 if (sbi->s_mount_opt & EXT4_MOUNT_DAX) { 3419 if (sbi->s_mount_opt & EXT4_MOUNT_DAX) {
3420 if (blocksize != PAGE_SIZE) { 3420 err = bdev_dax_supported(sb, blocksize);
3421 ext4_msg(sb, KERN_ERR, 3421 if (err)
3422 "error: unsupported blocksize for dax");
3423 goto failed_mount;
3424 }
3425 if (!sb->s_bdev->bd_disk->fops->direct_access) {
3426 ext4_msg(sb, KERN_ERR,
3427 "error: device does not support dax");
3428 goto failed_mount; 3422 goto failed_mount;
3429 }
3430 } 3423 }
3431 3424
3432 if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) { 3425 if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {