From patchwork Tue Mar 14 21:03:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 9624499 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 28BF2604CC for ; Tue, 14 Mar 2017 21:04:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BC5E285CF for ; Tue, 14 Mar 2017 21:04:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10A93285DA; Tue, 14 Mar 2017 21:04: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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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 AA34C285CF for ; Tue, 14 Mar 2017 21:04:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752759AbdCNVEf (ORCPT ); Tue, 14 Mar 2017 17:04:35 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:36772 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134AbdCNVEc (ORCPT ); Tue, 14 Mar 2017 17:04:32 -0400 Received: by mail-pg0-f48.google.com with SMTP id g2so78617157pge.3 for ; Tue, 14 Mar 2017 14:04:31 -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=bgKhyH7IXL6GvGUYHhKQsZJ4ow6nuyxEqmhHxw7kGSc=; b=qRYeMfvLUxz2yAaGnJXIqZfWsSnfUgKHX+RWFqhhgH/OJfVgyyWImW07FbCDS9ysQf 1AnPlQzQOQe8Vl5SqAESmcG9tUmWafX4cuYUHG/3Zv8cIpKDTYx0yw6kym7ds92aL11g V5UVxP7v56n8ZDCwI16C13fd/Tcu84xZ9I9db3sl97MKibgPcaseTx8+YwM26EQxWV8+ MeuhA+JdD+TyzahGS5bCTIhYtGXZmcMIs2AlQqIbTWLSMWkiChxfk6uQ59gjtBazbsJ0 RWGzC6A97U2bqHnjtQX2iZlFFGMwxKslJboJXMGHeDM570sNV+tjjYPIm5zliW3Sz3sd 2jgQ== 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=bgKhyH7IXL6GvGUYHhKQsZJ4ow6nuyxEqmhHxw7kGSc=; b=OI+11nIudmQ2kqj135nmTpNsRil8TYVKTP1oFSFjQCNOr2UqC2NubAC/tNkVNVOYo5 pwXlpSreICb9C8POP6FxpqXMuvmvyqkhaDIz7W7u9EyNApyzx1n4IjfiImEE9TAnkwt/ RSAE8qr2Cen+B69QqI995IUY05Z61AtfoE0h7y9vtEkr9lG8xm+BCwbIYks7E3aO6rgp WeL4/mIfh2TnjdFuwFaMAysNrwjHl5m1DwtA8Mpep04SbfyPiGJYRq3Dp1xqOjT7qVjX RFZFJqcPucNbqkGh/sRX99sSOAZH8crHb43Gm5ogW+0iMZMk3wtOPmS+fFbpI7W5O6xA 1rig== X-Gm-Message-State: AMke39ntyY7gRvR3WHk8Xyp4hQDAkvH1a92D/fAZsQ1sqjVd7n4Lxz6tmi3DhTPJXxm5PsRW X-Received: by 10.98.158.71 with SMTP id s68mr47169937pfd.159.1489525471285; Tue, 14 Mar 2017 14:04:31 -0700 (PDT) Received: from vader.thefacebook.com ([2620:10d:c090:200::6:9a2a]) by smtp.gmail.com with ESMTPSA id 80sm40404273pgd.39.2017.03.14.14.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Mar 2017 14:04:30 -0700 (PDT) From: Omar Sandoval To: linux-block@vger.kernel.org Cc: kernel-team@fb.com Subject: [PATCH 2/4] block: remove extra calls to wbt_exit() Date: Tue, 14 Mar 2017 14:03:29 -0700 Message-Id: <271bf1f64b59245a9ba25a6ec7ceeb39ae1a582e.1489524591.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 0eeb99ef654f..82425017c9b8 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 159187a28d66..eb84daf550f4 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2430,8 +2430,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);