diff options
Diffstat (limited to 'kernel/block/blk-core.c')
| -rw-r--r-- | kernel/block/blk-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/block/blk-core.c b/kernel/block/blk-core.c index 2f7afb98e..52d2fe2fe 100644 --- a/kernel/block/blk-core.c +++ b/kernel/block/blk-core.c @@ -518,7 +518,9 @@ EXPORT_SYMBOL_GPL(blk_queue_bypass_end); void blk_set_queue_dying(struct request_queue *q) { - queue_flag_set_unlocked(QUEUE_FLAG_DYING, q); + spin_lock_irq(q->queue_lock); + queue_flag_set(QUEUE_FLAG_DYING, q); + spin_unlock_irq(q->queue_lock); if (q->mq_ops) blk_mq_wake_waiters(q); @@ -2192,7 +2194,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq) if (q->mq_ops) { if (blk_queue_io_stat(q)) blk_account_io_start(rq, true); - blk_mq_insert_request(rq, false, true, true); + blk_mq_insert_request(rq, false, true, false); return 0; } |