From patchwork Sun Sep 18 07:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 9337659 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 6B3AC6022E for ; Sun, 18 Sep 2016 07:39:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 61D1B2907D for ; Sun, 18 Sep 2016 07:39:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5671129082; Sun, 18 Sep 2016 07:39:42 +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 E84BE2907D for ; Sun, 18 Sep 2016 07:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932212AbcIRHjg (ORCPT ); Sun, 18 Sep 2016 03:39:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36456 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758349AbcIRHhk (ORCPT ); Sun, 18 Sep 2016 03:37:40 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 4BE4667C3B; Sun, 18 Sep 2016 07:37:40 +0000 (UTC) Received: from dhcp-27-118.brq.redhat.com (dhcp-27-122.brq.redhat.com [10.34.27.122]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8I7bTpW025554; Sun, 18 Sep 2016 03:37:39 -0400 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , linux-block@vger.kernel.org Subject: [PATCH 08/14] blk-mq: Get rid of unnecessary blk_mq_free_hw_queues() Date: Sun, 18 Sep 2016 09:37:18 +0200 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 18 Sep 2016 07:37:40 +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 Signed-off-by: Alexander Gordeev --- block/blk-mq.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index b2ef8f5..3efb700 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1686,17 +1686,8 @@ static void blk_mq_exit_hw_queues(struct request_queue *q, struct blk_mq_hw_ctx *hctx; unsigned int i; - 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, - struct blk_mq_tag_set *set) -{ - struct blk_mq_hw_ctx *hctx; - unsigned int i; - queue_for_each_hw_ctx(q, hctx, i) { + blk_mq_exit_hctx(q, set, hctx, i); free_cpumask_var(hctx->cpumask); kfree(hctx->ctxs); kfree(hctx); @@ -2120,9 +2111,7 @@ void blk_mq_free_queue(struct request_queue *q) mutex_unlock(&all_q_mutex); blk_mq_del_queue_tag_set(q); - blk_mq_exit_hw_queues(q, set); - blk_mq_free_hw_queues(q, set); } /* Basically redo blk_mq_init_queue with queue frozen */