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

!8861 blk-iocost: do not WARN if iocg was already offlined 

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

 

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 e098ab36 cbe4df82

block/blk-iocost.c

+5 −2
Original line number Diff line number Diff line
@@ -1392,8 +1392,11 @@ static void iocg_pay_debt(struct ioc_gq *iocg, u64 abs_vpay, 
	lockdep_assert_held(&iocg->ioc->lock);

	lockdep_assert_held(&iocg->waitq.lock);



	/* make sure that nobody messed with @iocg */

	WARN_ON_ONCE(list_empty(&iocg->active_list));

	/*

	 * make sure that nobody messed with @iocg. Check iocg->online

	 * to avoid warn when removing blkcg or disk.

	 */

	WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->online);

	WARN_ON_ONCE(iocg->inuse > 1);



	iocg->abs_vdebt -= min(abs_vpay, iocg->abs_vdebt);