summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorBart Van Assche <bart.vanassche@wdc.com>2017-11-08 10:23:45 -0800
committerJens Axboe <axboe@kernel.dk>2017-11-10 19:53:25 -0700
commitaba7afc5671c23beade64d10caf86e24a9105dab (patch)
treea5283da0814f4a2aeda727e34572ef2f71a90918 /block
parentab083b11f6f43af071f9b507e48d212bfbb2beb3 (diff)
downloadlinux-stable-aba7afc5671c23beade64d10caf86e24a9105dab.tar.gz
linux-stable-aba7afc5671c23beade64d10caf86e24a9105dab.tar.bz2
linux-stable-aba7afc5671c23beade64d10caf86e24a9105dab.zip
blk-mq: Avoid that request queue removal can trigger list corruption
Avoid that removal of a request queue sporadically triggers the following warning: list_del corruption. next->prev should be ffff8807d649b970, but was 6b6b6b6b6b6b6b6b WARNING: CPU: 3 PID: 342 at lib/list_debug.c:56 __list_del_entry_valid+0x92/0xa0 Call Trace: process_one_work+0x11b/0x660 worker_thread+0x3d/0x3b0 kthread+0x129/0x140 ret_from_fork+0x27/0x40 Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.com> Cc: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index b8d1aa2d1008..5e81dcf4690a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -339,6 +339,7 @@ void blk_sync_queue(struct request_queue *q)
struct blk_mq_hw_ctx *hctx;
int i;
+ cancel_delayed_work_sync(&q->requeue_work);
queue_for_each_hw_ctx(q, hctx, i)
cancel_delayed_work_sync(&hctx->run_work);
} else {