diff options
| author | Omar Sandoval <osandov@fb.com> | 2017-03-16 16:46:14 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-03-16 16:46:14 +0100 |
| commit | efd4b81abbe1ac753717f2f10cd3dab8bed6c103 (patch) | |
| tree | 2bba3ec40209e5ef9db3c083c39a941290cdfcb6 /block/blk-stat.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-efd4b81abbe1ac753717f2f10cd3dab8bed6c103.tar.xz linux-efd4b81abbe1ac753717f2f10cd3dab8bed6c103.zip | |
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: cf43e6b ("block: add scalable completion tracking of requests")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-stat.c')
| -rw-r--r-- | block/blk-stat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-stat.c b/block/blk-stat.c index 9b43efb8933f..186fcb981e9b 100644 --- a/block/blk-stat.c +++ b/block/blk-stat.c @@ -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); |