Commit 9420e720 authored by David Laight's avatar David Laight Committed by Jens Axboe
Browse files

block: use min() instead of min_t() 



min_t(unsigned int, a, b) casts an 'unsigned long' to 'unsigned int'.
Use min(a, b) instead as it promotes any 'unsigned int' to 'unsigned long'
and so cannot discard significant bits.

In this case the 'unsigned long' value is small enough that the result
is ok.

(Similarly for max_t() and clamp_t().)

Detected by an extra check added to min_t().

Signed-off-by: default avatarDavid Laight <david.laight.linux@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e8f0abdd

block/blk-iocost.c

+2 −4
Original line number Diff line number Diff line
@@ -2334,9 +2334,7 @@ static void ioc_timer_fn(struct timer_list *timer) 
			else

				usage_dur = max_t(u64, now.now - ioc->period_at, 1);



			usage = clamp_t(u32,

				DIV64_U64_ROUND_UP(usage_us * WEIGHT_ONE,

						   usage_dur),

			usage = clamp(DIV64_U64_ROUND_UP(usage_us * WEIGHT_ONE, usage_dur),

				      1, WEIGHT_ONE);



			/*

block/partitions/efi.c

+1 −2
Original line number Diff line number Diff line
@@ -215,8 +215,7 @@ static int is_pmbr_valid(legacy_mbr *mbr, sector_t total_sectors) 
		sz = le32_to_cpu(mbr->partition_record[part].size_in_lba);

		if (sz != (uint32_t) total_sectors - 1 && sz != 0xFFFFFFFF)

			pr_debug("GPT: mbr size in lba (%u) different than whole disk (%u).\n",

				 sz, min_t(uint32_t,

					   total_sectors - 1, 0xFFFFFFFF));

				 sz, (uint32_t)min(total_sectors - 1, 0xFFFFFFFF));

	}

done:

	return ret;