From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f65.google.com ([209.85.221.65]:35869 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388136AbeGWO0N (ORCPT ); Mon, 23 Jul 2018 10:26:13 -0400 Received: by mail-wr1-f65.google.com with SMTP id h9-v6so715771wro.3 for ; Mon, 23 Jul 2018 06:24:59 -0700 (PDT) From: Jack Wang To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Ming Lei , Jens Axboe , Jack Wang Subject: [stable-4.14 14/23] blk-flush: use blk_mq_request_bypass_insert() Date: Mon, 23 Jul 2018 15:24:36 +0200 Message-Id: <1532352285-13589-15-git-send-email-jinpuwang@gmail.com> In-Reply-To: <1532352285-13589-1-git-send-email-jinpuwang@gmail.com> References: <1532352285-13589-1-git-send-email-jinpuwang@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Ming Lei commit 598906f814280762157629ba8833bf5cb11def74 upstream In the following patch, we will use RQF_FLUSH_SEQ to decide: 1) if the flag isn't set, the flush rq need to be inserted via blk_insert_flush() 2) otherwise, the flush rq need to be dispatched directly since it is in flush machinery now. So we use blk_mq_request_bypass_insert() for requests of bypassing flush machinery, just like the legacy path did. Signed-off-by: Ming Lei Signed-off-by: Jens Axboe Signed-off-by: Jack Wang --- block/blk-flush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-flush.c b/block/blk-flush.c index 81bd1a843043..a9773d2075ac 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c @@ -463,7 +463,7 @@ void blk_insert_flush(struct request *rq) if ((policy & REQ_FSEQ_DATA) && !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) { if (q->mq_ops) - blk_mq_sched_insert_request(rq, false, false, false, false); + blk_mq_request_bypass_insert(rq, false); else list_add_tail(&rq->queuelist, &q->queue_head); return; -- 2.7.4