Commit 7d8d0014 authored Mar 16, 2017 by Omar Sandoval Committed by Jens Axboe Mar 21, 2017

blk-stat: fix blk_stat_sum() if all samples are batched



We need to flush the batch _before_ we check the number of samples,
otherwise we'll miss all of the batched samples.

Fixes: cf43e6be ("block: add scalable completion tracking of requests")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 97da3854

block/blk-stat.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@ static void blk_stat_flush_batch(struct blk_rq_stat *stat)

		static void blk_stat_sum(struct blk_rq_stat dst, struct blk_rq_stat src)
		{
		blk_stat_flush_batch(src);

		if (!src->nr_samples)
		return;

		blk_stat_flush_batch(src);

		dst->min = min(dst->min, src->min);
		dst->max = max(dst->max, src->max);