ext4: Add alignment check for DAX mount
authorToshi Kani <toshi.kani@hpe.com>
Tue, 10 May 2016 16:23:54 +0000 (10:23 -0600)
committerVishal Verma <vishal.l.verma@intel.com>
Tue, 17 May 2016 06:44:11 +0000 (00:44 -0600)
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>
fs/ext4/super.c

index 20c5d52253b4924c9c1d0cf27110a566e5e3f234..3822a5aedc61b241d937c474192bfa57e5b3b2c5 100644 (file)
@@ -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 (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;
-               }
        }
 
        if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) {