X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=fs%2Fext2%2Fsuper.c;h=1d9379568aa833b1fdd48a8ff112d343e3a7f773;hb=43a0a98aa8da71583f84b84fd72e265c24d4c5f8;hp=b78caf25f746220ce635a3bd946bedeaf7e3e750;hpb=6ea24cf79e055f0a62a64baa8587e2254a493c7b;p=deliverable%2Flinux.git

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.. */