[15/51] dm/bufio: Change 'int rw' into 'enum req_op op'

Message ID	20220623180528.3595304-16-bvanassche@acm.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-block-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Bart Van Assche <bvanassche@acm.org>, Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org> Subject: [PATCH 15/51] dm/bufio: Change 'int rw' into 'enum req_op op' Date: Thu, 23 Jun 2022 11:04:52 -0700 Message-Id: <20220623180528.3595304-16-bvanassche@acm.org> In-Reply-To: <20220623180528.3595304-1-bvanassche@acm.org> References: <20220623180528.3595304-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Improve static type checking for request flags \| expand [00/51] Improve static type checking for request flags [01/51] treewide: Rename enum req_opf into enum req_op [02/51] block: Use enum req_op where appropriate [03/51] block: Change the type of the last .rw_page() argument [04/51] block: Change the type of req_op() and bio_op() into enum req_op [05/51] block: Introduce the type blk_opf_t [06/51] block: Use the new blk_opf_t type [07/51] blktrace: Use the new blk_opf_t type [08/51] blktrace: Trace remap operations correctly [09/51] block/brd: Use the enum req_op type [10/51] block/drbd: Use the enum req_op and blk_opf_t types [11/51] block/floppy: Fix a sparse warning [12/51] block/null_blk: Fix sparse warnings in tracing code [13/51] um: Use enum req_op where appropriate [14/51] dm/core: Use the enum req_op and blk_opf_t types [15/51] dm/bufio: Change 'int rw' into 'enum req_op op' [16/51] dm/kcopyd: Rename kcopyd_job.rw into kcopyd_job.op [17/51] dm/ebs: Change 'int rw' into 'enum req_op op' [18/51] dm/dm-flakey: Use the new blk_opf_t type [19/51] dm/dm-integrity: Use the enum req_op and blk_opf_t types [20/51] dm/dm-snap: Use the enum req_op and blk_opf_t types [21/51] dm/dm-zoned: Use the enum req_op type [22/51] md/core: Use the enum req_op and blk_opf_t types [23/51] md/bcache: Use the enum req_op and blk_opf_t types [24/51] md/raid1: Use the new blk_opf_t type [25/51] md/raid10: Use the new blk_opf_t type [26/51] md/raid5: Use the enum req_op and blk_opf_t types [27/51] nvme/host: Use the enum req_op and blk_opf_t types [28/51] nvme/target: Use the new blk_opf_t type [29/51] scsi/core: Improve static type checking [30/51] scsi/core: Change the return type of scsi_noretry_cmd() into bool [31/51] scsi/core: Use the new blk_opf_t type [32/51] scsi/device_handlers: Use the new blk_opf_t type [33/51] scsi/ufs: Rename a 'dir' argument into 'op' [34/51] scsi/target: Use the new blk_opf_t type [35/51] mm: Use the new blk_opf_t type [36/51] fs/buffer: Use the new blk_opf_t type [37/51] fs/direct-io: Use the enum req_op and blk_opf_t types [38/51] fs/mpage: Use the new blk_opf_t type [39/51] fs/btrfs: Use the enum req_op and blk_opf_t types [40/51] fs/ext4: Use the new blk_opf_t type [41/51] fs/f2fs: Use the enum req_op and blk_opf_t types [42/51] fs/gfs2: Use the enum req_op and blk_opf_t types [43/51] fs/hfsplus: Use the enum req_op and blk_opf_t types [44/51] fs/iomap: Use the new blk_opf_t type [45/51] fs/jbd2: Fix the documentation of the jbd2_write_superblock() callers [46/51] fs/nilfs: Use the enum req_op and blk_opf_t types [47/51] fs/ntfs3: Use enum req_op where appropriate [48/51] fs/ocfs2: Use the enum req_op and blk_opf_t types [49/51] PM: Use the enum req_op and blk_opf_t types [50/51] fs/xfs: Use the enum req_op and blk_opf_t types [51/51] fs/zonefs: Fix sparse warnings in tracing code

Message ID

20220623180528.3595304-16-bvanassche@acm.org (mailing list archive)

State

New, archived

Headers

From: Bart Van Assche <bvanassche@acm.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
        Bart Van Assche <bvanassche@acm.org>,
        Alasdair Kergon <agk@redhat.com>,
        Mike Snitzer <snitzer@kernel.org>
Subject: [PATCH 15/51] dm/bufio: Change 'int rw' into 'enum req_op op'
Date: Thu, 23 Jun 2022 11:04:52 -0700
Message-Id: <20220623180528.3595304-16-bvanassche@acm.org>
In-Reply-To: <20220623180528.3595304-1-bvanassche@acm.org>
References: <20220623180528.3595304-1-bvanassche@acm.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Improve static type checking for request flags | expand

Commit Message

Bart Van Assche June 23, 2022, 6:04 p.m. UTC

Improve static type checking by using type 'enum req_op' instead of 'int'.
Make the role of the 'rw' arguments more clear by renaming these into 'op'
(operation). This patch does not change any functionality.

Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/md/dm-bufio.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 5ffa1dcf84cf..666b36d043d4 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -577,12 +577,12 @@  static void dmio_complete(unsigned long error, void *context)
 	b->end_io(b, unlikely(error != 0) ? BLK_STS_IOERR : 0);
 }
 
-static void use_dmio(struct dm_buffer *b, int rw, sector_t sector,
+static void use_dmio(struct dm_buffer *b, enum req_op op, sector_t sector,
 		     unsigned n_sectors, unsigned offset)
 {
 	int r;
 	struct dm_io_request io_req = {
-		.bi_op = rw,
+		.bi_op = op,
 		.bi_op_flags = 0,
 		.notify.fn = dmio_complete,
 		.notify.context = b,
@@ -616,7 +616,7 @@  static void bio_complete(struct bio *bio)
 	b->end_io(b, status);
 }
 
-static void use_bio(struct dm_buffer *b, int rw, sector_t sector,
+static void use_bio(struct dm_buffer *b, enum req_op op, sector_t sector,
 		    unsigned n_sectors, unsigned offset)
 {
 	struct bio *bio;
@@ -630,10 +630,10 @@  static void use_bio(struct dm_buffer *b, int rw, sector_t sector,
 	bio = bio_kmalloc(vec_size, GFP_NOWAIT | __GFP_NORETRY | __GFP_NOWARN);
 	if (!bio) {
 dmio:
-		use_dmio(b, rw, sector, n_sectors, offset);
+		use_dmio(b, op, sector, n_sectors, offset);
 		return;
 	}
-	bio_init(bio, b->c->bdev, bio->bi_inline_vecs, vec_size, rw);
+	bio_init(bio, b->c->bdev, bio->bi_inline_vecs, vec_size, op);
 	bio->bi_iter.bi_sector = sector;
 	bio->bi_end_io = bio_complete;
 	bio->bi_private = b;
@@ -669,7 +669,8 @@  static inline sector_t block_to_sector(struct dm_bufio_client *c, sector_t block
 	return sector;
 }
 
-static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buffer *, blk_status_t))
+static void submit_io(struct dm_buffer *b, enum req_op op,
+		      void (*end_io)(struct dm_buffer *, blk_status_t))
 {
 	unsigned n_sectors;
 	sector_t sector;
@@ -679,7 +680,7 @@  static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buff
 
 	sector = block_to_sector(b->c, b->block);
 
-	if (rw != REQ_OP_WRITE) {
+	if (op != REQ_OP_WRITE) {
 		n_sectors = b->c->block_size >> SECTOR_SHIFT;
 		offset = 0;
 	} else {
@@ -698,9 +699,9 @@  static void submit_io(struct dm_buffer *b, int rw, void (*end_io)(struct dm_buff
 	}
 
 	if (b->data_mode != DATA_MODE_VMALLOC)
-		use_bio(b, rw, sector, n_sectors, offset);
+		use_bio(b, op, sector, n_sectors, offset);
 	else
-		use_dmio(b, rw, sector, n_sectors, offset);
+		use_dmio(b, op, sector, n_sectors, offset);
 }
 
 /*----------------------------------------------------------------

[15/51] dm/bufio: Change 'int rw' into 'enum req_op op'

Commit Message

Patch