block: make bdev_ops->rw_page() take a REQ_OP instead of bool

[mirror_ubuntu-focal-kernel.git] / drivers / nvdimm / btt.c

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 85de8053aa344510a9f071db342404a424c16c73..0360c015f6580b1cb5fef2667b2844381f0c8696 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1423,11 +1423,11 @@ static int btt_write_pg(struct btt *btt, struct bio_integrity_payload *bip,
 
 static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip,
                        struct page *page, unsigned int len, unsigned int off,
-                       bool is_write, sector_t sector)
+                       unsigned int op, sector_t sector)
 {
        int ret;
 
-       if (!is_write) {
+       if (!op_is_write(op)) {
                ret = btt_read_pg(btt, bip, page, off, sector, len);
                flush_dcache_page(page);
        } else {
@@ -1464,7 +1464,7 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
                }
 
                err = btt_do_bvec(btt, bip, bvec.bv_page, len, bvec.bv_offset,
-                                 op_is_write(bio_op(bio)), iter.bi_sector);
+                                 bio_op(bio), iter.bi_sector);
                if (err) {
                        dev_err(&btt->nd_btt->dev,
                                        "io error in %s sector %lld, len %d,\n",
@@ -1483,16 +1483,16 @@ static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio)
 }
 
 static int btt_rw_page(struct block_device *bdev, sector_t sector,
-               struct page *page, bool is_write)
+               struct page *page, unsigned int op)
 {
        struct btt *btt = bdev->bd_disk->private_data;
        int rc;
        unsigned int len;
 
        len = hpage_nr_pages(page) * PAGE_SIZE;
-       rc = btt_do_bvec(btt, NULL, page, len, 0, is_write, sector);
+       rc = btt_do_bvec(btt, NULL, page, len, 0, op, sector);
        if (rc == 0)
-               page_endio(page, is_write, 0);
+               page_endio(page, op_is_write(op), 0);
 
        return rc;
 }