X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fblock%2Fblk-core.c;fp=kernel%2Fblock%2Fblk-core.c;h=52d2fe2fec8faf6433cfe87b7701d149cdc27773;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=2f7afb98e8e0e543042c47bbf8475f080f5f7ac5;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

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;
 	}