[v2,57/63] fs/nfs: Use enum req_op where appropriate

Message ID	20220629233145.2779494-58-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>, Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org> Subject: [PATCH v2 57/63] fs/nfs: Use enum req_op where appropriate Date: Wed, 29 Jun 2022 16:31:39 -0700 Message-Id: <20220629233145.2779494-58-bvanassche@acm.org> In-Reply-To: <20220629233145.2779494-1-bvanassche@acm.org> References: <20220629233145.2779494-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Improve static type checking for request flags \| expand [v2,00/63] Improve static type checking for request flags [v2,01/63] treewide: Rename enum req_opf into enum req_op [v2,02/63] block: Use enum req_op where appropriate [v2,03/63] block: Change the type of the last .rw_page() argument [v2,04/63] block: Change the type of req_op() and bio_op() into enum req_op [v2,05/63] block: Introduce the type blk_opf_t [v2,06/63] block: Use the new blk_opf_t type [v2,07/63] block/bfq: Use the new blk_opf_t type [v2,08/63] block/mq-deadline: Use the new blk_opf_t type [v2,09/63] block/kyber: Use the new blk_opf_t type [v2,10/63] blktrace: Trace remapped requests correctly [v2,11/63] blktrace: Use the new blk_opf_t type [v2,12/63] block/brd: Use the enum req_op type [v2,13/63] block/drbd: Use the enum req_op and blk_opf_t types [v2,14/63] block/drbd: Combine two drbd_submit_peer_request() arguments [v2,15/63] block/floppy: Fix a sparse warning [v2,16/63] block/rnbd: Use blk_opf_t where appropriate [v2,17/63] xen-blkback: Use the enum req_op and blk_opf_t types [v2,18/63] block/zram: Use enum req_op where appropriate [v2,19/63] nvdimm-btt: Use the enum req_op type [v2,20/63] um: Use enum req_op where appropriate [v2,21/63] dm/core: Reduce the size of struct dm_io_request [v2,22/63] dm/core: Rename kcopyd_job.rw into kcopyd.op [v2,23/63] dm/core: Combine request operation type and flags [v2,24/63] dm/ebs: Change 'int rw' into 'enum req_op op' [v2,25/63] dm/dm-flakey: Use the new blk_opf_t type [v2,26/63] dm/dm-integrity: Combine request operation and flags [v2,27/63] dm mirror log: Use the new blk_opf_t type [v2,28/63] dm-snap: Combine request operation type and flags [v2,29/63] dm/zone: Use the enum req_op type [v2,30/63] dm/dm-zoned: Use the enum req_op type [v2,31/63] md/core: Combine two sync_page_io() arguments [v2,32/63] md/bcache: Combine two uuid_io() arguments [v2,33/63] md/bcache: Combine two prio_io() arguments [v2,34/63] md/raid1: Use the new blk_opf_t type [v2,35/63] md/raid10: Use the new blk_opf_t type [v2,36/63] md/raid5: Use the enum req_op and blk_opf_t types [v2,37/63] nvme/host: Use the enum req_op and blk_opf_t types [v2,38/63] nvme/target: Use the new blk_opf_t type [v2,39/63] scsi/core: Improve static type checking [v2,40/63] scsi/core: Change the return type of scsi_noretry_cmd() into bool [v2,41/63] scsi/core: Use the new blk_opf_t type [v2,42/63] scsi/device_handlers: Use the new blk_opf_t type [v2,43/63] scsi/ufs: Rename a 'dir' argument into 'op' [v2,44/63] scsi/target: Use the new blk_opf_t type [v2,45/63] mm: Use the new blk_opf_t type [v2,46/63] fs/buffer: Use the new blk_opf_t type [v2,47/63] fs/buffer: Combine two submit_bh() and ll_rw_block() arguments [v2,48/63] fs/direct-io: Reduce the size of struct dio [v2,49/63] fs/mpage: Use the new blk_opf_t type [v2,50/63] fs/btrfs: Use the enum req_op and blk_opf_t types [v2,51/63] fs/ext4: Use the new blk_opf_t type [v2,52/63] fs/f2fs: Use the enum req_op and blk_opf_t types [v2,53/63] fs/gfs2: Use the enum req_op and blk_opf_t types [v2,54/63] fs/hfsplus: Use the enum req_op and blk_opf_t types [v2,55/63] fs/iomap: Use the new blk_opf_t type [v2,56/63] fs/jbd2: Fix the documentation of the jbd2_write_superblock() callers [v2,57/63] fs/nfs: Use enum req_op where appropriate [v2,58/63] fs/nilfs2: Use the enum req_op and blk_opf_t types [v2,59/63] fs/ntfs3: Use enum req_op where appropriate [v2,60/63] fs/ocfs2: Use the enum req_op and blk_opf_t types [v2,61/63] PM: Use the enum req_op and blk_opf_t types [v2,62/63] fs/xfs: Use the enum req_op and blk_opf_t types [v2,63/63] fs/zonefs: Use the enum req_op type for request operations

Message ID

20220629233145.2779494-58-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>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>
Subject: [PATCH v2 57/63] fs/nfs: Use enum req_op where appropriate
Date: Wed, 29 Jun 2022 16:31:39 -0700
Message-Id: <20220629233145.2779494-58-bvanassche@acm.org>
In-Reply-To: <20220629233145.2779494-1-bvanassche@acm.org>
References: <20220629233145.2779494-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 29, 2022, 11:31 p.m. UTC

Improve static type checking by using enum req_op for request operations.
Rename an 'rw' argument into 'op' since that name is typically used for
request operations. This patch does not change any functionality. Note:
REQ_OP_READ = READ = 0 and REQ_OP_WRITE = WRITE = 1.

Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 fs/nfs/blocklayout/blocklayout.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 79a8b451791f..943aeea1eb16 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -121,7 +121,7 @@  static bool offset_in_map(u64 offset, struct pnfs_block_dev_map *map)
 }
 
 static struct bio *
-do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect,
+do_add_page_to_bio(struct bio *bio, int npg, enum req_op op, sector_t isect,
 		struct page *page, struct pnfs_block_dev_map *map,
 		struct pnfs_block_extent *be, bio_end_io_t end_io,
 		struct parallel_io *par, unsigned int offset, int *len)
@@ -131,7 +131,7 @@  do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect,
 	u64 disk_addr, end;
 
 	dprintk("%s: npg %d rw %d isect %llu offset %u len %d\n", __func__,
-		npg, rw, (unsigned long long)isect, offset, *len);
+		npg, (__force u32)op, (unsigned long long)isect, offset, *len);
 
 	/* translate to device offset */
 	isect += be->be_v_offset;
@@ -154,7 +154,7 @@  do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect,
 
 retry:
 	if (!bio) {
-		bio = bio_alloc(map->bdev, bio_max_segs(npg), rw, GFP_NOIO);
+		bio = bio_alloc(map->bdev, bio_max_segs(npg), op, GFP_NOIO);
 		bio->bi_iter.bi_sector = disk_addr >> SECTOR_SHIFT;
 		bio->bi_end_io = end_io;
 		bio->bi_private = par;
@@ -291,7 +291,7 @@  bl_read_pagelist(struct nfs_pgio_header *header)
 		} else {
 			bio = do_add_page_to_bio(bio,
 						 header->page_array.npages - i,
-						 READ,
+						 REQ_OP_READ,
 						 isect, pages[i], &map, &be,
 						 bl_end_io_read, par,
 						 pg_offset, &pg_len);
@@ -420,9 +420,8 @@  bl_write_pagelist(struct nfs_pgio_header *header, int sync)
 
 		pg_len = PAGE_SIZE;
 		bio = do_add_page_to_bio(bio, header->page_array.npages - i,
-					 WRITE, isect, pages[i], &map, &be,
-					 bl_end_io_write, par,
-					 0, &pg_len);
+					 REQ_OP_WRITE, isect, pages[i], &map,
+					 &be, bl_end_io_write, par, 0, &pg_len);
 		if (IS_ERR(bio)) {
 			header->pnfs_error = PTR_ERR(bio);
 			bio = NULL;

[v2,57/63] fs/nfs: Use enum req_op where appropriate

Commit Message

Patch