From patchwork Tue Mar 21 15:56:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9637011 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 0ABA460327 for ; Tue, 21 Mar 2017 15:59:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2D6326E64 for ; Tue, 21 Mar 2017 15:59:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7BEC28343; Tue, 21 Mar 2017 15:59:36 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 1BAB128342 for ; Tue, 21 Mar 2017 15:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932839AbdCUP56 (ORCPT ); Tue, 21 Mar 2017 11:57:58 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:34892 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757077AbdCUP5I (ORCPT ); Tue, 21 Mar 2017 11:57:08 -0400 Received: by mail-pg0-f48.google.com with SMTP id t143so29935367pgb.2 for ; Tue, 21 Mar 2017 08:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ZjYnJY8IMBJcu4GOcX61GNv+/a9Vl4qeDju9+KZUcdE=; b=vrj9Z3aw7aDimKfgXquND4x0MKHFbVPRfrJ8JoO3rujaum4GEs3au9RVK6fx9AP6TQ /onomTeuyWfIJ8o6jAnFRGTDPYWgjO3alpThJT2uHTpA6R7ctQe2W59wXRi8bHUCjVol s3081SWHYfZtns4r8S+r5VK+cZfa41srZSmeX99sJvNZOZzUf20vi8dGD3mRVsZXierv SM8yvRZLyuefbHUVp5G1/QUefcttoAARcmeopsphmr6OXPVwW4q/ls1HZE18vMfmB31w e4pybwDBcvUPMDLPrPz/17Qzm3gCWBEHn5h6Wm/8viMNT3bivcgI0mMJKR8vE2EJOw2X HiMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ZjYnJY8IMBJcu4GOcX61GNv+/a9Vl4qeDju9+KZUcdE=; b=hgQykwIZERu9x+RoNMkDHDgK5ECizvrG7eXKJ93ez8t3TI64csAhYAFIcu4sFyGsLZ yjgKhg2znCR8++AQXDfGme7O1f6u9NqBXlmbto/dH6VTTwTHj3n1r1Zo+vEJD73/i4sx WdDCatKUOo6kXc2LacwRo/TeaZRnvd8/FrMBKDOOWKJDiw3I94HSKnN61r4QJXDLglQD weIR4btHArmJLIfyfSYoblnuRA+wBNZsW+Gn8cd5lw27QZqMhSThMbVJ1fUZcUOeURI6 BHw2IrCEhnAlj58Z0y75b/SIBoIAy3y8Rpjj5H7SK8VZQtBWgIttQMLGnjijOkfM9/BZ r8AQ== X-Gm-Message-State: AFeK/H3coScj5S4hWBXp+smECcbJf/aDOOI18O0X/qk//tG1R3hNlApOJsJa1gZFKG9AsnIR X-Received: by 10.84.178.1 with SMTP id y1mr48328446plb.60.1490111826923; Tue, 21 Mar 2017 08:57:06 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:180::1:b316]) by smtp.gmail.com with ESMTPSA id k2sm40731140pga.29.2017.03.21.08.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 08:57:06 -0700 (PDT) From: Omar Sandoval To: linux-block@vger.kernel.org Cc: kernel-team@fb.com, Omar Sandoval Subject: [PATCH v2 1/4] block: remove extra calls to wbt_exit() Date: Tue, 21 Mar 2017 08:56:05 -0700 Message-Id: <1386deceff74f907b78e3fbea4799b677a45792a.1490110621.git.osandov@fb.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: In-Reply-To: References: 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 From: Omar Sandoval We always call wbt_exit() from blk_release_queue(), so these are unnecessary. Signed-off-by: Omar Sandoval --- block/blk-core.c | 1 - block/blk-mq.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index d772c221cc17..e8a9bc0d4bbb 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -889,7 +889,6 @@ int blk_init_allocated_queue(struct request_queue *q) q->exit_rq_fn(q, q->fq->flush_rq); out_free_flush_queue: blk_free_flush_queue(q->fq); - wbt_exit(q); return -ENOMEM; } EXPORT_SYMBOL(blk_init_allocated_queue); diff --git a/block/blk-mq.c b/block/blk-mq.c index a4546f060e80..534f49a90e3a 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2431,8 +2431,6 @@ void blk_mq_free_queue(struct request_queue *q) list_del_init(&q->all_q_node); mutex_unlock(&all_q_mutex); - wbt_exit(q); - blk_mq_del_queue_tag_set(q); blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);