Merge tag 'libnvdimm-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[linux-2.6-block.git] / drivers / block / brd.c

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 588360d79fcae57bd909b6526505198d0c4e119d..8028a3a7e7fd63cabb8ce47c021e90e26d09a7ba 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -21,11 +21,6 @@
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/backing-dev.h>
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-#include <linux/pfn_t.h>
-#include <linux/dax.h>
-#include <linux/uio.h>
-#endif
 
 #include <linux/uaccess.h>
 
@@ -45,9 +40,6 @@ struct brd_device {
 
        struct request_queue    *brd_queue;
        struct gendisk          *brd_disk;
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-       struct dax_device       *dax_dev;
-#endif
        struct list_head        brd_list;
 
        /*
@@ -112,9 +104,6 @@ static struct page *brd_insert_page(struct brd_device *brd, sector_t sector)
         * restriction might be able to be lifted.
         */
        gfp_flags = GFP_NOIO | __GFP_ZERO;
-#ifndef CONFIG_BLK_DEV_RAM_DAX
-       gfp_flags |= __GFP_HIGHMEM;
-#endif
        page = alloc_page(gfp_flags);
        if (!page)
                return NULL;
@@ -334,43 +323,6 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector,
        return err;
 }
 
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,
-               long nr_pages, void **kaddr, pfn_t *pfn)
-{
-       struct page *page;
-
-       if (!brd)
-               return -ENODEV;
-       page = brd_insert_page(brd, (sector_t)pgoff << PAGE_SECTORS_SHIFT);
-       if (!page)
-               return -ENOSPC;
-       *kaddr = page_address(page);
-       *pfn = page_to_pfn_t(page);
-
-       return 1;
-}
-
-static long brd_dax_direct_access(struct dax_device *dax_dev,
-               pgoff_t pgoff, long nr_pages, void **kaddr, pfn_t *pfn)
-{
-       struct brd_device *brd = dax_get_private(dax_dev);
-
-       return __brd_direct_access(brd, pgoff, nr_pages, kaddr, pfn);
-}
-
-static size_t brd_dax_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,
-               void *addr, size_t bytes, struct iov_iter *i)
-{
-       return copy_from_iter(addr, bytes, i);
-}
-
-static const struct dax_operations brd_dax_ops = {
-       .direct_access = brd_dax_direct_access,
-       .copy_from_iter = brd_dax_copy_from_iter,
-};
-#endif
-
 static const struct block_device_operations brd_fops = {
        .owner =                THIS_MODULE,
        .rw_page =              brd_rw_page,
@@ -451,21 +403,8 @@ static struct brd_device *brd_alloc(int i)
        set_capacity(disk, rd_size * 2);
        disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
 
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-       queue_flag_set_unlocked(QUEUE_FLAG_DAX, brd->brd_queue);
-       brd->dax_dev = alloc_dax(brd, disk->disk_name, &brd_dax_ops);
-       if (!brd->dax_dev)
-               goto out_free_inode;
-#endif
-
-
        return brd;
 
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-out_free_inode:
-       kill_dax(brd->dax_dev);
-       put_dax(brd->dax_dev);
-#endif
 out_free_queue:
        blk_cleanup_queue(brd->brd_queue);
 out_free_dev:
@@ -505,10 +444,6 @@ out:
 static void brd_del_one(struct brd_device *brd)
 {
        list_del(&brd->brd_list);
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-       kill_dax(brd->dax_dev);
-       put_dax(brd->dax_dev);
-#endif
        del_gendisk(brd->brd_disk);
        brd_free(brd);
 }