superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 67927d2201 ("block/merge: count bytes instead of
sectors"), the min() was with UINT_MAX >> 9, so it did have an effect.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250214193637.234702-1-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/1156/head
Caleb Sander Mateos 2025-02-14 12:36:36 -07:00 committed by Jens Axboe
parent 80e648042e
commit 43c70b1040
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-merge.c
View File

@ -270,7 +270,7 @@ static bool bvec_split_segs(const struct queue_limits *lim,
const struct bio_vec *bv, unsigned *nsegs, unsigned *bytes, const struct bio_vec *bv, unsigned *nsegs, unsigned *bytes,
unsigned max_segs, unsigned max_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 len = min(bv->bv_len, max_len);
unsigned total_len = 0; unsigned total_len = 0;
unsigned seg_size = 0; unsigned seg_size = 0;