1 files changed, 10 insertions, 2 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 8f5b533764ca..9437a5eb07cf 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -737,12 +737,20 @@ static void blk_mq_requeue_work(struct work_struct *work)
         spin_unlock_irq(&q->requeue_lock);
 
         list_for_each_entry_safe(rq, next, &rq_list, queuelist) {
-                if (!(rq->rq_flags & RQF_SOFTBARRIER))
+                if (!(rq->rq_flags & (RQF_SOFTBARRIER | RQF_DONTPREP)))
                         continue;
 
                 rq->rq_flags &= ~RQF_SOFTBARRIER;
                 list_del_init(&rq->queuelist);
-                blk_mq_sched_insert_request(rq, true, false, false);
+                /*
+                 * If RQF_DONTPREP, rq has contained some driver specific
+                 * data, so insert it to hctx dispatch list to avoid any
+                 * merge.
+                 */
+                if (rq->rq_flags & RQF_DONTPREP)
+                        blk_mq_request_bypass_insert(rq, false);
+                else
+                        blk_mq_sched_insert_request(rq, true, false, false);
         }
 
         while (!list_empty(&rq_list)) {