diff options
| author |   Jens Axboe <axboe@fb.com> | 2017-04-10 09:54:54 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-28 08:10:15 -0600 |
| commit | 9f993737906b30d7b2454a38637d1f70ffd60f2f (patch) | |
| tree | de9f50b9f8411ad9306796746900195a0b6f45e6 /include/linux/blk-mq.h | |
| parent | nbd: fix use after free on module unload (diff) | |
| download | linux-dev-9f993737906b30d7b2454a38637d1f70ffd60f2f.tar.xz linux-dev-9f993737906b30d7b2454a38637d1f70ffd60f2f.zip | |
blk-mq: unify hctx delayed_run_work and run_work
They serve the exact same purpose. Get rid of the non-delayed
work variant, and just run it without delay for the normal case.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blk-mq.h')
| -rw-r--r-- | include/linux/blk-mq.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 32bd8eb5ba67..c7cc90328426 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -15,7 +15,7 @@ struct blk_mq_hw_ctx { unsigned long state; /* BLK_MQ_S_* flags */ } ____cacheline_aligned_in_smp; - struct work_struct run_work; + struct delayed_work run_work; cpumask_var_t cpumask; int next_cpu; int next_cpu_batch; @@ -51,7 +51,6 @@ struct blk_mq_hw_ctx { atomic_t nr_active; - struct delayed_work delayed_run_work; struct delayed_work delay_work; struct hlist_node cpuhp_dead; |