Commit 16458cf3 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Use the new blk_opf_t type 



Use the new blk_opf_t type for arguments and variables that represent
request flags or a bitwise combination of a request operation and
request flags. Rename the function arguments and also a structure member
that hold a request operation and flags from 'rw' into 'opf'.

This patch does not change any functionality.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.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: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-7-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 342a72a3

block/bio.c

+5 −5
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static void bio_free(struct bio *bio) 
 * when IO has completed, or when the bio is released.

 */

void bio_init(struct bio *bio, struct block_device *bdev, struct bio_vec *table,

	      unsigned short max_vecs, unsigned int opf)

	      unsigned short max_vecs, blk_opf_t opf)

{

	bio->bi_next = NULL;

	bio->bi_bdev = bdev;
@@ -292,7 +292,7 @@ EXPORT_SYMBOL(bio_init); 
 *   preserved are the ones that are initialized by bio_alloc_bioset(). See

 *   comment in struct bio.

 */

void bio_reset(struct bio *bio, struct block_device *bdev, unsigned int opf)

void bio_reset(struct bio *bio, struct block_device *bdev, blk_opf_t opf)

{

	bio_uninit(bio);

	memset(bio, 0, BIO_RESET_BYTES);
@@ -341,7 +341,7 @@ void bio_chain(struct bio *bio, struct bio *parent) 
EXPORT_SYMBOL(bio_chain);



struct bio *blk_next_bio(struct bio *bio, struct block_device *bdev,

		unsigned int nr_pages, unsigned int opf, gfp_t gfp)

		unsigned int nr_pages, blk_opf_t opf, gfp_t gfp)

{

	struct bio *new = bio_alloc(bdev, nr_pages, opf, gfp);
@@ -409,7 +409,7 @@ static void punt_bios_to_rescuer(struct bio_set *bs) 
}



static struct bio *bio_alloc_percpu_cache(struct block_device *bdev,

		unsigned short nr_vecs, unsigned int opf, gfp_t gfp,

		unsigned short nr_vecs, blk_opf_t opf, gfp_t gfp,

		struct bio_set *bs)

{

	struct bio_alloc_cache *cache;
@@ -468,7 +468,7 @@ static struct bio *bio_alloc_percpu_cache(struct block_device *bdev, 
 * Returns: Pointer to new bio on success, NULL on failure.

 */

struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs,

			     unsigned int opf, gfp_t gfp_mask,

			     blk_opf_t opf, gfp_t gfp_mask,

			     struct bio_set *bs)

{

	gfp_t saved_gfp = gfp_mask;

block/blk-cgroup-rwstat.h

+4 −4
Original line number Diff line number Diff line
@@ -59,20 +59,20 @@ void blkg_rwstat_recursive_sum(struct blkcg_gq *blkg, struct blkcg_policy *pol, 
 * caller is responsible for synchronizing calls to this function.

 */

static inline void blkg_rwstat_add(struct blkg_rwstat *rwstat,

				   unsigned int op, uint64_t val)

				   blk_opf_t opf, uint64_t val)

{

	struct percpu_counter *cnt;



	if (op_is_discard(op))

	if (op_is_discard(opf))

		cnt = &rwstat->cpu_cnt[BLKG_RWSTAT_DISCARD];

	else if (op_is_write(op))

	else if (op_is_write(opf))

		cnt = &rwstat->cpu_cnt[BLKG_RWSTAT_WRITE];

	else

		cnt = &rwstat->cpu_cnt[BLKG_RWSTAT_READ];



	percpu_counter_add_batch(cnt, val, BLKG_STAT_CPU_BATCH);



	if (op_is_sync(op))

	if (op_is_sync(opf))

		cnt = &rwstat->cpu_cnt[BLKG_RWSTAT_SYNC];

	else

		cnt = &rwstat->cpu_cnt[BLKG_RWSTAT_ASYNC];

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ EXPORT_SYMBOL_GPL(blk_io_schedule); 


int __init blk_dev_init(void)

{

	BUILD_BUG_ON(REQ_OP_LAST >= (1 << REQ_OP_BITS));

	BUILD_BUG_ON((__force u32)REQ_OP_LAST >= (1 << REQ_OP_BITS));

	BUILD_BUG_ON(REQ_OP_BITS + REQ_FLAG_BITS > 8 *

			sizeof_field(struct request, cmd_flags));

	BUILD_BUG_ON(REQ_OP_BITS + REQ_FLAG_BITS > 8 *

block/blk-flush.c

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ enum { 
};



static void blk_kick_flush(struct request_queue *q,

			   struct blk_flush_queue *fq, unsigned int flags);

			   struct blk_flush_queue *fq, blk_opf_t flags);



static inline struct blk_flush_queue *

blk_get_flush_queue(struct request_queue *q, struct blk_mq_ctx *ctx)
@@ -173,7 +173,7 @@ static void blk_flush_complete_seq(struct request *rq, 
{

	struct request_queue *q = rq->q;

	struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];

	unsigned int cmd_flags;

	blk_opf_t cmd_flags;



	BUG_ON(rq->flush.seq & seq);

	rq->flush.seq |= seq;
@@ -290,7 +290,7 @@ bool is_flush_rq(struct request *rq) 
 *

 */

static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,

			   unsigned int flags)

			   blk_opf_t flags)

{

	struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];

	struct request *first_rq =

block/blk-merge.c

+3 −3
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req, 
 */

void blk_rq_set_mixed_merge(struct request *rq)

{

	unsigned int ff = rq->cmd_flags & REQ_FAILFAST_MASK;

	blk_opf_t ff = rq->cmd_flags & REQ_FAILFAST_MASK;

	struct bio *bio;



	if (rq->rq_flags & RQF_MIXED_MERGE)
@@ -928,7 +928,7 @@ enum bio_merge_status { 
static enum bio_merge_status bio_attempt_back_merge(struct request *req,

		struct bio *bio, unsigned int nr_segs)

{

	const int ff = bio->bi_opf & REQ_FAILFAST_MASK;

	const blk_opf_t ff = bio->bi_opf & REQ_FAILFAST_MASK;



	if (!ll_back_merge_fn(req, bio, nr_segs))

		return BIO_MERGE_FAILED;
@@ -952,7 +952,7 @@ static enum bio_merge_status bio_attempt_back_merge(struct request *req, 
static enum bio_merge_status bio_attempt_front_merge(struct request *req,

		struct bio *bio, unsigned int nr_segs)

{

	const int ff = bio->bi_opf & REQ_FAILFAST_MASK;

	const blk_opf_t ff = bio->bi_opf & REQ_FAILFAST_MASK;



	if (!ll_front_merge_fn(req, bio, nr_segs))

		return BIO_MERGE_FAILED;