Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"

This reverts commit cb2ac29. Alex and the kernel test robot report that this causes a significant performance regression with BFQ. I can reproduce that result, so let's revert this one as we're close to -rc6 and we there's no point in trying to rush a fix. Link: https://lore.kernel.org/linux-block/1639853092.524jxfaem2.none@localhost/ Link: https://lore.kernel.org/lkml/20211219141852.GH14057@xsang-OptiPlex-9020/ Reported-by: Alex Xu (Hello71) <[email protected]> Reported-by: kernel test robot <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
LoveHeat · Dec 19, 2021 · 87959fa · 87959fa
1 parent aa97f6c
commit 87959fa
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/block/blk-core.c b/block/blk-core.c
@@ -1484,8 +1484,6 @@ EXPORT_SYMBOL(kblockd_schedule_work);
 int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork,
 				unsigned long delay)
 {
-	if (!delay)
-		return queue_work_on(cpu, kblockd_workqueue, &dwork->work);
 	return mod_delayed_work_on(cpu, kblockd_workqueue, dwork, delay);
 }
 EXPORT_SYMBOL(kblockd_mod_delayed_work_on);