block: Change the type of the last .rw_page() argument

All .rw_page() callers pass an enum req_op value as last argument. Make
this explicit by changing the type of the last argument into enum req_op.
See also commit 3f289dcb4b26 ("block: make bdev_ops->rw_page() take a
REQ_OP instead of bool").

Cc: Tejun Heo <tj@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Damien Le Moal <damien.lemoal@wdc.com>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-4-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 9e26d5e769f321ffcb8555651d6fa4cf249c43f8..7b82876af36eb0354aae44f5d9c32200ce077ce8 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -310,7 +310,7 @@ static void brd_submit_bio(struct bio *bio)
 }
 
 static int brd_rw_page(struct block_device *bdev, sector_t sector,
-                      struct page *page, unsigned int op)
+                      struct page *page, enum req_op op)
 {
        struct brd_device *brd = bdev->bd_disk->private_data;
        int err;

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index e5233c911e43646a60fb59d294dcb98ffa448259..a35b86c58aa25fb9c7e6ee0b16eb526bccc68b92 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1631,7 +1631,7 @@ static void zram_slot_free_notify(struct block_device *bdev,
 }
 
 static int zram_rw_page(struct block_device *bdev, sector_t sector,
-                      struct page *page, unsigned int op)
+                      struct page *page, enum req_op op)
 {
        int offset, ret;
        u32 index;

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 5e622c0d4b66a7a8fc01c9ca0fed1a339f1d34e6..dfbf73145d16886c2807505ad9f334334a5fb65b 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1483,7 +1483,7 @@ static void btt_submit_bio(struct bio *bio)
 }
 
 static int btt_rw_page(struct block_device *bdev, sector_t sector,
-               struct page *page, unsigned int op)
+               struct page *page, enum req_op op)
 {
        struct btt *btt = bdev->bd_disk->private_data;
        int rc;

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index a72b81fa324260e2ee3755e972c2b0cbabb229aa..f36efcc11f6759e32bb3f25461f0352383cb90bb 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -239,7 +239,7 @@ static void pmem_submit_bio(struct bio *bio)
 }
 
 static int pmem_rw_page(struct block_device *bdev, sector_t sector,
-                      struct page *page, unsigned int op)
+                      struct page *page, enum req_op op)
 {
        struct pmem_device *pmem = bdev->bd_disk->private_data;
        blk_status_t rc;

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 2f13f0062192bfd7cdef7a7f54d302a5c89ce3e5..ca2ff113ea00b5e8cd07a5cbbd28dc480b9093fe 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1381,7 +1381,7 @@ struct block_device_operations {
                        unsigned int flags);
        int (*open) (struct block_device *, fmode_t);
        void (*release) (struct gendisk *, fmode_t);
-       int (*rw_page)(struct block_device *, sector_t, struct page *, unsigned int);
+       int (*rw_page)(struct block_device *, sector_t, struct page *, enum req_op);
        int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
        int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
        unsigned int (*check_events) (struct gendisk *disk,