Commit efef739d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: fold blk_max_size_offset into get_max_io_size 



Now that blk_max_size_offset has a single caller left, fold it into that
and clean up the naming convention for the local variables there.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220614090934.570632-6-hch@lst.de


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

block/blk-merge.c

+7 −2
Original line number Diff line number Diff line
@@ -166,9 +166,14 @@ static inline unsigned get_max_io_size(struct request_queue *q, 
{

	unsigned pbs = queue_physical_block_size(q) >> SECTOR_SHIFT;

	unsigned lbs = queue_logical_block_size(q) >> SECTOR_SHIFT;

	unsigned max_sectors, start, end;

	unsigned max_sectors = queue_max_sectors(q), start, end;



	if (q->limits.chunk_sectors) {

		max_sectors = min(max_sectors,

			blk_chunk_sectors_left(bio->bi_iter.bi_sector,

					       q->limits.chunk_sectors));

	}



	max_sectors = blk_max_size_offset(q, bio->bi_iter.bi_sector, 0);

	start = bio->bi_iter.bi_sector & (pbs - 1);

	end = (start + max_sectors) & ~(pbs - 1);

	if (end > start)

include/linux/blkdev.h

+0 −19
Original line number Diff line number Diff line
@@ -945,25 +945,6 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset, 
	return chunk_sectors - (offset & (chunk_sectors - 1));

}



/*

 * Return maximum size of a request at given offset. Only valid for

 * file system requests.

 */

static inline unsigned int blk_max_size_offset(struct request_queue *q,

					       sector_t offset,

					       unsigned int chunk_sectors)

{

	if (!chunk_sectors) {

		if (q->limits.chunk_sectors)

			chunk_sectors = q->limits.chunk_sectors;

		else

			return q->limits.max_sectors;

	}



	return min(q->limits.max_sectors,

			blk_chunk_sectors_left(offset, chunk_sectors));

}



/*

 * Access functions for manipulating queue properties

 */