From patchwork Wed Oct 31 17:59:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10663087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B5ED313A4 for ; Wed, 31 Oct 2018 18:00:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E0B2B4D3 for ; Wed, 31 Oct 2018 18:00:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 947232B4DD; Wed, 31 Oct 2018 18:00:00 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 3F0232B4D3 for ; Wed, 31 Oct 2018 18:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730063AbeKAC7D (ORCPT ); Wed, 31 Oct 2018 22:59:03 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:35861 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730060AbeKAC7C (ORCPT ); Wed, 31 Oct 2018 22:59:02 -0400 Received: by mail-io1-f65.google.com with SMTP id o19-v6so10351086iod.3 for ; Wed, 31 Oct 2018 10:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Oc7vc+QOBEZDLRdp/nP+eTB+4epQrRfeqnCYEaksMMI=; b=ZvRU8VZbcjn8hiFaBHxsb9E7PRggpW5gsJ5e0myOuaLSCNo1dEDkORemZ0NanXIOtM px7KcrvBTps26RmWE0G3LbAfm1ELUfKDJKh5zLcgQqynVPodFpVZBNUSjc63UhRgb0As UyNT23Ah8JzSY/5BHF+icmdQP1pSjz1Z5Mp3rdh8fmKQ4PQnwfaqwrlZ16ZhJs2cbwEP +JaTzdeVDv/wgnhIAgRctIaymGgybYfTa5aPGgZws3M/RdCtb3ywAC0wVl4gBW//COKQ DTIqa3LBMD3+uJtgZVIMYgsIIX4GrhCLGmXqfCi6Mc0ogo8ISY39Y3OWgahqMwLps6EF EezA== 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; bh=Oc7vc+QOBEZDLRdp/nP+eTB+4epQrRfeqnCYEaksMMI=; b=ZvSjvJce55tBDND6nTmsMBqmQ3++0JuUQViJYlXDIs5+kWlPBWMWTkV8nCUUP4wBdk mE/qpgTPW6Dja6Y7kkqaS/1pUhI7ywUm7ukoY1JN8YuosvzZb8x7fvHuOrLVlrChNXMz BmW5OhedHRYCIphh+HfmT5/+qDhlX7QLK/zcKGdzOUDAIjLvvy1KBW8T7BlFKpr4rm1x FCNUDpxaAFT+PH0xBsyWrd/EhQzf5h2QcDKLABbmx1Tt4l0SDETrnU+/MJtlrSY8Poiq y1EuCB1Qs3TAapfUozGiXx5WZzoAIOiupXsyuyaFnmuGQPo2UfU5r0+OtNaU5rwRhtn5 I5rg== X-Gm-Message-State: AGRZ1gJdRkeLPWtij4840ef/5kcjWWow1xxU2xKVERPKzHkEBthqywz0 Rqny/5EFTbJVYZpbxMR3EX7Q/w== X-Google-Smtp-Source: AJdET5fzJLaAGXM5cjZCkL1um7gwI0V1xGHgC8Htd+OGlMr35XFInMhWsyQDn/5sIJdSSHxMdt+2aQ== X-Received: by 2002:a6b:14d8:: with SMTP id 207-v6mr2853508iou.103.1541008797845; Wed, 31 Oct 2018 10:59:57 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 197-v6sm10982947iou.87.2018.10.31.10.59.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 10:59:56 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 16/30] blk-wbt: kill check for legacy queue type Date: Wed, 31 Oct 2018 11:59:08 -0600 Message-Id: <20181031175922.8849-17-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031175922.8849-1-axboe@kernel.dk> References: <20181031175922.8849-1-axboe@kernel.dk> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Everything is blk-mq at this point, so it doesn't make any sense to have this option available as it does nothing. Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe --- block/Kconfig | 6 ------ block/blk-wbt.c | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/block/Kconfig b/block/Kconfig index f7045aa47edb..8044452a4fd3 100644 --- a/block/Kconfig +++ b/block/Kconfig @@ -155,12 +155,6 @@ config BLK_CGROUP_IOLATENCY Note, this is an experimental interface and could be changed someday. -config BLK_WBT_SQ - bool "Single queue writeback throttling" - depends on BLK_WBT - ---help--- - Enable writeback throttling by default on legacy single queue devices - config BLK_WBT_MQ bool "Multiqueue writeback throttling" default y diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 8ac93fcbaa2e..0fc222d4194b 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -709,8 +709,7 @@ void wbt_enable_default(struct request_queue *q) if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags)) return; - if ((q->mq_ops && IS_ENABLED(CONFIG_BLK_WBT_MQ)) || - (q->request_fn && IS_ENABLED(CONFIG_BLK_WBT_SQ))) + if (q->mq_ops && IS_ENABLED(CONFIG_BLK_WBT_MQ)) wbt_init(q); } EXPORT_SYMBOL_GPL(wbt_enable_default);