Merge tag 'dax-misc-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm...

[linux] / block / ioctl.c

diff --git a/block/ioctl.c b/block/ioctl.c
index 7eeda07..ed2397f 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -568,9 +568,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: