Commit 19206d3f authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

block: Delete bio_set_prio() 



Since commit 43b62ce3 ("block: move bio io prio to a new field"), macro
bio_set_prio() does nothing but set bio->bi_ioprio. All other places just
set bio->bi_ioprio directly, so replace bio_set_prio() remaining
callsites with setting bio->bi_ioprio directly and delete that macro.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Acked-by: default avatarJack Wang <jinpu.wang@ionos.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20241202111957.2311683-3-john.g.garry@oracle.com


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

drivers/block/rnbd/rnbd-srv.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int process_rdma(struct rnbd_srv_session *srv_sess, 
	bio->bi_iter.bi_sector = le64_to_cpu(msg->sector);

	prio = srv_sess->ver < RNBD_PROTO_VER_MAJOR ||

	       usrlen < sizeof(*msg) ? 0 : le16_to_cpu(msg->prio);

	bio_set_prio(bio, prio);

	bio->bi_ioprio = prio;



	submit_bio(bio);

drivers/md/bcache/movinggc.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void moving_init(struct moving_io *io) 
	bio_init(bio, NULL, bio->bi_inline_vecs,

		 DIV_ROUND_UP(KEY_SIZE(&io->w->key), PAGE_SECTORS), 0);

	bio_get(bio);

	bio_set_prio(bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));

	bio->bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0);



	bio->bi_iter.bi_size	= KEY_SIZE(&io->w->key) << 9;

	bio->bi_private		= &io->cl;

drivers/md/bcache/writeback.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static void dirty_init(struct keybuf_key *w) 
	bio_init(bio, NULL, bio->bi_inline_vecs,

		 DIV_ROUND_UP(KEY_SIZE(&w->key), PAGE_SECTORS), 0);

	if (!io->dc->writeback_percent)

		bio_set_prio(bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));

		bio->bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0);



	bio->bi_iter.bi_size	= KEY_SIZE(&w->key) << 9;

	bio->bi_private		= w;

fs/bcachefs/move.c

+3 −3
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ int bch2_move_extent(struct moving_context *ctxt, 
	io->write_sectors	= k.k->size;



	bio_init(&io->write.op.wbio.bio, NULL, io->bi_inline_vecs, pages, 0);

	bio_set_prio(&io->write.op.wbio.bio,

		     IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));

	io->write.op.wbio.bio.bi_ioprio =

		     IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0);



	if (bch2_bio_alloc_pages(&io->write.op.wbio.bio, sectors << 9,

				 GFP_KERNEL))
@@ -303,7 +303,7 @@ int bch2_move_extent(struct moving_context *ctxt, 
	io->rbio.opts		= io_opts;

	bio_init(&io->rbio.bio, NULL, io->bi_inline_vecs, pages, 0);

	io->rbio.bio.bi_vcnt = pages;

	bio_set_prio(&io->rbio.bio, IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0));

	io->rbio.bio.bi_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0);

	io->rbio.bio.bi_iter.bi_size = sectors << 9;



	io->rbio.bio.bi_opf		= REQ_OP_READ;

include/linux/bio.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ static inline unsigned int bio_max_segs(unsigned int nr_segs) 
	return min(nr_segs, BIO_MAX_VECS);

}



#define bio_set_prio(bio, prio)		((bio)->bi_ioprio = prio)



#define bio_iter_iovec(bio, iter)				\

	bvec_iter_bvec((bio)->bi_io_vec, (iter))