Commit 5c292ac6 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

block: Delete bio_prio() 



Since commit 43b62ce3 ("block: move bio io prio to a new field"), macro
bio_prio() does nothing but return the value in bio->bi_ioprio. Most other
places just read bio->bi_ioprio directly, so replace bi_ioprio() callsites
with reading bio->bi_ioprio directly and delete that macro.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20241202111957.2311683-2-john.g.garry@oracle.com


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

drivers/md/dm-verity-fec.c

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_io *io, 
	u8 *par, *block;

	struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);



	par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio_prio(bio));

	par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);

	if (IS_ERR(par))

		return PTR_ERR(par);
@@ -160,7 +160,7 @@ static int fec_decode_bufs(struct dm_verity *v, struct dm_verity_io *io, 
		if (offset >= v->fec->io_size) {

			dm_bufio_release(buf);



			par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio_prio(bio));

			par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);

			if (IS_ERR(par))

				return PTR_ERR(par);

		}
@@ -250,7 +250,7 @@ static int fec_read_bufs(struct dm_verity *v, struct dm_verity_io *io, 
			bufio = v->bufio;

		}



		bbuf = dm_bufio_read_with_ioprio(bufio, block, &buf, bio_prio(bio));

		bbuf = dm_bufio_read_with_ioprio(bufio, block, &buf, bio->bi_ioprio);

		if (IS_ERR(bbuf)) {

			DMWARN_LIMIT("%s: FEC %llu: read failed (%llu): %ld",

				     v->data_dev->name,

drivers/md/dm-verity-target.c

+2 −2
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int verity_verify_level(struct dm_verity *v, struct dm_verity_io *io, 
		}

	} else {

		data = dm_bufio_read_with_ioprio(v->bufio, hash_block,

						&buf, bio_prio(bio));

						&buf, bio->bi_ioprio);

	}



	if (IS_ERR(data))
@@ -789,7 +789,7 @@ static int verity_map(struct dm_target *ti, struct bio *bio) 


	verity_fec_init_io(io);



	verity_submit_prefetch(v, io, bio_prio(bio));

	verity_submit_prefetch(v, io, bio->bi_ioprio);



	submit_bio_noacct(bio);

include/linux/bio.h

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

}



#define bio_prio(bio)			(bio)->bi_ioprio

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



#define bio_iter_iovec(bio, iter)				\