Unverified Commit 37d5a96f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8046 block: prevent division by zero in blk_rq_stat_sum() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JORXUXBIWDP2GN35YVA4YQ7F5JMWVNEW/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QGM9 
 
Link:https://gitee.com/openeuler/kernel/pulls/8046

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents fe164f57 61a3dc50

block/blk-stat.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ void blk_rq_stat_init(struct blk_rq_stat *stat) 
/* src is a per-cpu stat, mean isn't initialized */

void blk_rq_stat_sum(struct blk_rq_stat *dst, struct blk_rq_stat *src)

{

	if (!src->nr_samples)

	if (dst->nr_samples + src->nr_samples <= dst->nr_samples)

		return;



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