diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-19 21:38:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-19 21:38:53 +0100 |
| commit | 2da09da4ae5e1714606668bdb145806b0afe9c90 (patch) | |
| tree | 231c912336606f39bbaee625ca1fcc8bea8a5fc7 | |
| parent | Merge tag 'irq_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" (diff) | |
| download | linux-2da09da4ae5e1714606668bdb145806b0afe9c90.tar.xz linux-2da09da4ae5e1714606668bdb145806b0afe9c90.zip | |
Merge tag 'block-5.16-2021-12-19' of git://git.kernel.dk/linux-block
Pull block revert from Jens Axboe:
"It turns out that the fix for not hammering on the delayed work timer
too much caused a performance regression for BFQ, so let's revert the
change for now.
I've got some ideas on how to fix it appropriately, but they should
wait for 5.17"
* tag 'block-5.16-2021-12-19' of git://git.kernel.dk/linux-block:
Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c1833f95cb97..1378d084c770 100644 --- 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); |