diff options
| author | Caleb Sander Mateos <[email protected]> | 2025-02-14 19:36:36 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2025-02-14 22:40:17 +0000 |
| commit | 43c70b104093c324b1a000762ce943d16ce788f9 (patch) | |
| tree | 4bb63f52c144920753e7bf5606cae2d7e9efe0e5 | |
| parent | partitions: mac: fix handling of bogus partition table (diff) | |
| download | kernel-43c70b104093c324b1a000762ce943d16ce788f9.tar.gz kernel-43c70b104093c324b1a000762ce943d16ce788f9.zip | |
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 67927d220150 ("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 <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 15cd231d560c..39b738c0e4c9 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -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; |