Merge tag 'libnvdimm-for-4.12' 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 4ec84d504780d9b606efe3dfdfb6910d1380d0bc..57b574f2f66a9d75a86f56a187e0fc9273b7c593 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #ifdef CONFIG_BLK_DEV_RAM_DAX
 #include <linux/pfn_t.h>
+#include <linux/dax.h>
 #endif
 
 #include <linux/uaccess.h>
@@ -41,6 +42,9 @@ 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;
 
        /*
@@ -326,30 +330,38 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector,
 }
 
 #ifdef CONFIG_BLK_DEV_RAM_DAX
-static long brd_direct_access(struct block_device *bdev, sector_t sector,
-                       void **kaddr, pfn_t *pfn, long size)
+static long __brd_direct_access(struct brd_device *brd, pgoff_t pgoff,
+               long nr_pages, void **kaddr, pfn_t *pfn)
 {
-       struct brd_device *brd = bdev->bd_disk->private_data;
        struct page *page;
 
        if (!brd)
                return -ENODEV;
-       page = brd_insert_page(brd, sector);
+       page = brd_insert_page(brd, PFN_PHYS(pgoff) / 512);
        if (!page)
                return -ENOSPC;
        *kaddr = page_address(page);
        *pfn = page_to_pfn_t(page);
 
-       return PAGE_SIZE;
+       return 1;
 }
-#else
-#define brd_direct_access NULL
+
+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 const struct dax_operations brd_dax_ops = {
+       .direct_access = brd_dax_direct_access,
+};
 #endif
 
 static const struct block_device_operations brd_fops = {
        .owner =                THIS_MODULE,
        .rw_page =              brd_rw_page,
-       .direct_access =        brd_direct_access,
 };
 
 /*
@@ -415,9 +427,6 @@ static struct brd_device *brd_alloc(int i)
         *  is harmless)
         */
        blk_queue_physical_block_size(brd->brd_queue, PAGE_SIZE);
-#ifdef CONFIG_BLK_DEV_RAM_DAX
-       queue_flag_set_unlocked(QUEUE_FLAG_DAX, brd->brd_queue);
-#endif
        disk = brd->brd_disk = alloc_disk(max_part);
        if (!disk)
                goto out_free_queue;
@@ -430,8 +439,21 @@ static struct brd_device *brd_alloc(int i)
        sprintf(disk->disk_name, "ram%d", i);
        set_capacity(disk, rd_size * 2);
 
+#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:
@@ -471,6 +493,10 @@ 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);
 }