From patchwork Mon Oct 29 16:34:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10659635 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 249301751 for ; Mon, 29 Oct 2018 16:35:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0769C29C45 for ; Mon, 29 Oct 2018 16:35:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA9F129C41; Mon, 29 Oct 2018 16:35:28 +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=unavailable 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 A03AF29C31 for ; Mon, 29 Oct 2018 16:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728046AbeJ3BYr (ORCPT ); Mon, 29 Oct 2018 21:24:47 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:40761 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728007AbeJ3BYl (ORCPT ); Mon, 29 Oct 2018 21:24:41 -0400 Received: by mail-io1-f66.google.com with SMTP id a23-v6so5373201iod.7 for ; Mon, 29 Oct 2018 09:35:21 -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=NFy4u9p1LJ7ibPKfxgoUPUefrMkUj4TuuT45jKSvBHfsZbJRiccSh+Hd56k+uwbYPo YfzUDEeQArd/u6ThJIlgwMdnF1ckeQt1zvSToq+28jy+eGj7fHC+mvsktQeR9DbGuHvl FwjhdtArm8Ys2FXsO46IYDiGFo7cQ+wV2lio6sJTxzGnhdLUz7SlHZUJk/M42MsP4sem gHQSzyrXV9BLT0uaJulX0OhJkpnz/F0gG7s3VmHAJpjUUzowuzzu0c9vpe4uibZO/8ta Y7zw6bpKtddV7IgGcKaghiA29Ou0vjiw6pIUE2Gq5KHu02Ew2uFMe4wUm1vdoWra1xTN WIGA== 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=WnMykueCHJs3tB2rcu7Ugg3MCEcyC6kLr6hMUEYp1Yxn/2l8iwL9mmzpsbU3rXcGnq 7JhcrPTj4DKnZFNzS6JXL5jEz/DrtqK7DQQCmyidyhOgHhMVFv3nix6E1O3sGx9+OVmJ apBJP/xPdXvH7q2e4ijGK//O/VLMWt5UULWt1itVf6En9pSfZw7xv09N1fTFVXwyY8gT lR498+lpQRofF/RIoHQhhGu54o0j0PY5mGeqN6ioCm2FISSAIP4zYMKPkZwoej6bYykF 47AIo8rnI8uP/ODgg085AAofLLwPKo9dH/HDs5lNqABwivl6FxLYLYCyEnJzkfPvjdjI LCmg== X-Gm-Message-State: AGRZ1gKAzcA8thMLwR6Ms+b6b5LUQL1NJPG6l0ljDbqrrg8D0TOO8xj8 rGBsKZa/pwVVwG4EZ3rwH1SWkQ== X-Google-Smtp-Source: AJdET5cC7q0BiSCQ82xOzorb8q6gQOKyEkAWXlWzzFlYosLxYNYA4SsZHMoSQeYCByJMHdTfbZCWDg== X-Received: by 2002:a5e:8a02:: with SMTP id d2-v6mr9150260iok.110.1540830920785; Mon, 29 Oct 2018 09:35:20 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id n7-v6sm6464500itb.22.2018.10.29.09.35.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:35:19 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 16/29] blk-wbt: kill check for legacy queue type Date: Mon, 29 Oct 2018 10:34:31 -0600 Message-Id: <20181029163444.9940-17-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181029163444.9940-1-axboe@kernel.dk> References: <20181029163444.9940-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);