From 44fe4b43e962fa4b2f4903590aa06e675674d593 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 May 2025 13:07:11 +0000 Subject: [PATCH] Revert "blk-iocost: do not WARN if iocg was already offlined" This reverts commit aed0aac18f039dd4af13c143063754efca358cb0 which is commit 01bc4fda9ea0a6b52f12326486f07a4910666cf6 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: Ib364e34f99f0350e81819022fb2eb1fd060b3ddd Signed-off-by: Greg Kroah-Hartman --- block/blk-iocost.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 20993d79d5cc..e270e64ba342 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -1430,11 +1430,8 @@ 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. Check iocg->pd.online - * to avoid warn when removing blkcg or disk. - */ - WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->pd.online); + /* make sure that nobody messed with @iocg */ + WARN_ON_ONCE(list_empty(&iocg->active_list)); WARN_ON_ONCE(iocg->inuse > 1); iocg->abs_vdebt -= min(abs_vpay, iocg->abs_vdebt);