Commit 284854be authored by Toshi Kani's avatar Toshi Kani Committed by Vishal Verma
Browse files

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: default avatarToshi Kani <toshi.kani@hpe.com>
Reviewed-by: default avatarJan 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: default avatarVishal Verma <vishal.l.verma@intel.com>
parent 87eefeb4
Loading
Loading
Loading
Loading
+2 −9
Original line number Diff line number Diff line
@@ -922,17 +922,10 @@ 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");
			goto failed_mount;
		}
		if (!sb->s_bdev->bd_disk->fops->direct_access) {
			ext2_msg(sb, KERN_ERR,
					"error: device does not support dax");
		err = bdev_dax_supported(sb, blocksize);
		if (err)
			goto failed_mount;
	}
	}

	/* If the blocksize doesn't match, re-read the thing.. */
	if (sb->s_blocksize != blocksize) {