From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933402AbaCQNjz (ORCPT ); Mon, 17 Mar 2014 09:39:55 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:51811 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933261AbaCQNbf (ORCPT ); Mon, 17 Mar 2014 09:31:35 -0400 Message-Id: <20140317133135.255494845@bombadil.infradead.org> User-Agent: quilt/0.60-1 Date: Mon, 17 Mar 2014 06:27:59 -0700 From: Christoph Hellwig To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 26/39] HACK: support blk_delay_queue for blk-mq References: <20140317132733.789623766@bombadil.infradead.org> Content-Disposition: inline; filename=0026-HACK-support-blk_delay_queue-for-blk-mq.patch X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- block/blk-core.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 4cd5ffc..47af781 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -163,9 +163,14 @@ static void blk_delay_work(struct work_struct *work) struct request_queue *q; q = container_of(work, struct request_queue, delay_work.work); - spin_lock_irq(q->queue_lock); - __blk_run_queue(q); - spin_unlock_irq(q->queue_lock); + + if (q->mq_ops) { + blk_mq_start_stopped_hw_queues(q, false); + } else { + spin_lock_irq(q->queue_lock); + __blk_run_queue(q); + spin_unlock_irq(q->queue_lock); + } } /** -- 1.7.10.4