Revert "block: enable dax for raw block devices"

This reverts commit 5a023cdba50c5f5f2bc351783b3131699deb3937.

The functionality is superseded by the new "Device DAX" facility.

Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 0 insertions, 32 deletions

diff --git a/block/ioctl.c b/block/ioctl.c
index 4ff1f92f89ca..698c7933d582 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -407,35 +407,6 @@ static inline int is_unrecognized_ioctl(int ret)
                 ret == -ENOIOCTLCMD;
 }
 
-#ifdef CONFIG_FS_DAX
-bool blkdev_dax_capable(struct block_device *bdev)
-{
-        struct gendisk *disk = bdev->bd_disk;
-
-        if (!disk->fops->direct_access)
-                return false;
-
-        /*
-         * If the partition is not aligned on a page boundary, we can't
-         * do dax I/O to it.
-         */
-        if ((bdev->bd_part->start_sect % (PAGE_SIZE / 512))
-                        || (bdev->bd_part->nr_sects % (PAGE_SIZE / 512)))
-                return false;
-
-        /*
-         * If the device has known bad blocks, force all I/O through the
-         * driver / page cache.
-         *
-         * TODO: support finer grained dax error handling
-         */
-        if (disk->bb && disk->bb->count)
-                return false;
-
-        return true;
-}
-#endif
-
 static int blkdev_flushbuf(struct block_device *bdev, fmode_t mode,
                 unsigned cmd, unsigned long arg)
 {
@@ -598,9 +569,6 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
         case BLKTRACESETUP:
         case BLKTRACETEARDOWN:
                 return blk_trace_ioctl(bdev, cmd, argp);
-        case BLKDAXGET:
-                return put_int(arg, !!(bdev->bd_inode->i_flags & S_DAX));
-                break;
         case IOC_PR_REGISTER:
                 return blkdev_pr_register(bdev, argp);
         case IOC_PR_RESERVE: