summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-01-28 04:22:03 +0300
committerDan Williams <dan.j.williams@intel.com>2017-04-25 23:20:46 +0300
commitd4b29fd78ea6fc2be219be3af1a992149b4ff0f6 (patch)
tree4020240085b9b61af2a27ebd454693e60f9ecd61 /drivers/block
parent2093f2e9dfec98e561c83e807910267bcbd8bb7b (diff)
downloadlinux-d4b29fd78ea6fc2be219be3af1a992149b4ff0f6.tar.xz
block: remove block_device_operations ->direct_access()
Now that all the producers and consumers of dax interfaces have been converted to using dax_operations on a dax_device, remove the block device direct_access enabling. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/brd.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 60f3193c9ce2..bfa4ed2c75ef 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -395,18 +395,6 @@ static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,
return 1;
}
-static long brd_blk_direct_access(struct block_device *bdev, sector_t sector,
- void **kaddr, pfn_t *pfn, long size)
-{
- struct brd_device *brd = bdev->bd_disk->private_data;
- long nr_pages = __brd_direct_access(brd, PHYS_PFN(sector * 512),
- PHYS_PFN(size), kaddr, pfn);
-
- if (nr_pages < 0)
- return nr_pages;
- return nr_pages * PAGE_SIZE;
-}
-
static long brd_dax_direct_access(struct dax_device *dax_dev,
pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn)
{
@@ -418,14 +406,11 @@ static long brd_dax_direct_access(struct dax_device *dax_dev,
static const struct dax_operations brd_dax_ops = {
.direct_access = brd_dax_direct_access,
};
-#else
-#define brd_blk_direct_access NULL
#endif
static const struct block_device_operations brd_fops = {
.owner = THIS_MODULE,
.rw_page = brd_rw_page,
- .direct_access = brd_blk_direct_access,
};
/*