diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
| commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
| tree | b9579893cdd559e7b72fa569003b19792de58fad /block | |
| parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
| parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'block')
| -rw-r--r-- | block/ioctl.c | 32 |
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: |