From patchwork Fri Sep 30 13:23:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9358261 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B20B6075E for ; Fri, 30 Sep 2016 13:24:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DE2C2A02A for ; Fri, 30 Sep 2016 13:24:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32F632A025; Fri, 30 Sep 2016 13:24:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDF482A025 for ; Fri, 30 Sep 2016 13:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933706AbcI3NX5 (ORCPT ); Fri, 30 Sep 2016 09:23:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47258 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933624AbcI3NXs (ORCPT ); Fri, 30 Sep 2016 09:23:48 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7561691FC8; Fri, 30 Sep 2016 13:23:47 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8UDNfDU023542; Fri, 30 Sep 2016 09:23:46 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , linux-block@vger.kernel.org Subject: [PATCH v2 4/8] blk-mq: Cleanup a loop exit condition Date: Fri, 30 Sep 2016 15:23:26 +0200 Message-Id: <4cd838ba766606c33a52d74c127d15f9cf21fa3d.1475241231.git.agordeev@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 30 Sep 2016 13:23:47 +0000 (UTC) Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP CC: linux-block@vger.kernel.org Reviewed-by: Omar Sandoval Signed-off-by: Alexander Gordeev Reviewed-by: Sagi Grimberg --- block/blk-mq.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index e3e9b23..eed6e348 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1607,16 +1607,13 @@ static void blk_mq_exit_hctx(struct request_queue *q, } static void blk_mq_exit_hw_queues(struct request_queue *q, - struct blk_mq_tag_set *set, int nr_queue) + struct blk_mq_tag_set *set) { struct blk_mq_hw_ctx *hctx; unsigned int i; - queue_for_each_hw_ctx(q, hctx, i) { - if (i == nr_queue) - break; + queue_for_each_hw_ctx(q, hctx, i) blk_mq_exit_hctx(q, set, hctx, i); - } } static void blk_mq_free_hw_queues(struct request_queue *q, @@ -2039,7 +2036,7 @@ void blk_mq_free_queue(struct request_queue *q) blk_mq_del_queue_tag_set(q); - blk_mq_exit_hw_queues(q, set, set->nr_hw_queues); + blk_mq_exit_hw_queues(q, set); blk_mq_free_hw_queues(q, set); }