diff options
| author | Toshi Kani <toshi.kani@hpe.com> | 2016-05-10 12:23:55 -0400 |
|---|---|---|
| committer | Vishal Verma <vishal.l.verma@intel.com> | 2016-05-17 02:44:12 -0400 |
| commit | 284854be2b85e967d17c098a1d4c176b5cd37eb3 (patch) | |
| tree | fd74304392cdee3e5bfd5de05a69599220e7ec8c /fs/ext2 | |
| parent | 87eefeb4e80b1526be83e670a08d059a003b7d0e (diff) | |
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.c | 11 |
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) | |||
| 922 | blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); | 922 | blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); |
| 923 | 923 | ||
| 924 | if (sbi->s_mount_opt & EXT2_MOUNT_DAX) { | 924 | if (sbi->s_mount_opt & EXT2_MOUNT_DAX) { |
| 925 | if (blocksize != PAGE_SIZE) { | 925 | err = bdev_dax_supported(sb, blocksize); |
| 926 | ext2_msg(sb, KERN_ERR, | 926 | if (err) |
| 927 | "error: unsupported blocksize for dax"); | ||
| 928 | goto failed_mount; | 927 | goto failed_mount; |
| 929 | } | ||
| 930 | if (!sb->s_bdev->bd_disk->fops->direct_access) { | ||
| 931 | ext2_msg(sb, KERN_ERR, | ||
| 932 | "error: device does not support dax"); | ||
| 933 | goto failed_mount; | ||
| 934 | } | ||
| 935 | } | 928 | } |
| 936 | 929 | ||
| 937 | /* If the blocksize doesn't match, re-read the thing.. */ | 930 | /* If the blocksize doesn't match, re-read the thing.. */ |
