From: Yu Kuai Date: Tue, 6 May 2025 12:48:55 +0000 (+0800) Subject: block: reuse part_in_flight_rw for part_in_flight X-Git-Tag: v6.16-rc1~216^2~31^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b8f19aee47414b4cf76b6ea0310b2937ebb97e7;p=thirdparty%2Fkernel%2Flinux.git block: reuse part_in_flight_rw for part_in_flight They are almost identical, to make code cleaner. Link: https://lore.kernel.org/linux-raid/20250506124903.2540268-2-yukuai1@huaweicloud.com Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig Reviewed-by: John Garry Reviewed-by: Hannes Reinecke --- diff --git a/block/genhd.c b/block/genhd.c index 9c7c657380db7..1df776e4ef927 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -125,21 +125,6 @@ static void part_stat_read_all(struct block_device *part, } } -unsigned int part_in_flight(struct block_device *part) -{ - unsigned int inflight = 0; - int cpu; - - for_each_possible_cpu(cpu) { - inflight += part_stat_local_read_cpu(part, in_flight[0], cpu) + - part_stat_local_read_cpu(part, in_flight[1], cpu); - } - if ((int)inflight < 0) - inflight = 0; - - return inflight; -} - static void part_in_flight_rw(struct block_device *part, unsigned int inflight[2]) { @@ -157,6 +142,15 @@ static void part_in_flight_rw(struct block_device *part, inflight[1] = 0; } +unsigned int part_in_flight(struct block_device *part) +{ + unsigned int inflight[2]; + + part_in_flight_rw(part, inflight); + + return inflight[READ] + inflight[WRITE]; +} + /* * Can be deleted altogether. Later. *