Commit 43c70b10 authored by Caleb Sander Mateos's avatar Caleb Sander Mateos Committed by Jens Axboe
Browse files

block/merge: remove unnecessary min() with UINT_MAX 



In bvec_split_segs(), max_bytes is an unsigned, so it must be less than
or equal to UINT_MAX. Remove the unnecessary min().

Prior to commit 67927d22 ("block/merge: count bytes instead of
sectors"), the min() was with UINT_MAX >> 9, so it did have an effect.

Signed-off-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250214193637.234702-1-csander@purestorage.com


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

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static bool bvec_split_segs(const struct queue_limits *lim, 
		const struct bio_vec *bv, unsigned *nsegs, unsigned *bytes,

		unsigned max_segs, unsigned max_bytes)

{

	unsigned max_len = min(max_bytes, UINT_MAX) - *bytes;

	unsigned max_len = max_bytes - *bytes;

	unsigned len = min(bv->bv_len, max_len);

	unsigned total_len = 0;

	unsigned seg_size = 0;