From patchwork Wed Oct 31 17:59:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10663091 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 CA8CF13A4 for ; Wed, 31 Oct 2018 18:00:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAC892B4D3 for ; Wed, 31 Oct 2018 18:00:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE5D32B4DC; Wed, 31 Oct 2018 18:00:01 +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 5E92D2B4D3 for ; Wed, 31 Oct 2018 18:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730188AbeKAC7E (ORCPT ); Wed, 31 Oct 2018 22:59:04 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:46191 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730061AbeKAC7E (ORCPT ); Wed, 31 Oct 2018 22:59:04 -0400 Received: by mail-io1-f68.google.com with SMTP id y22-v6so10338410ioj.13 for ; Wed, 31 Oct 2018 11:00:00 -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=V+5Vz0pOXre1WTDKfJcxhsnViUSpFJqWp7JIiR14uz8=; b=Ht+HTpxFrdOGYTRlLI7cTiyXfSwSGbiryVxieHgTmNKLAdpBih8KOPWvo0Zp5clrbG 8HDrrKF9AaNliy6GOXBDONuMMqRlIo5EkYlTy9i7x+O/l2u47ggLDjUp4jBrASq1bUQX xDObCArG1EIvrkZCXn6VRM1PdkHvx+UXKdVOWgPy8sv3tDeKxrp8Mshw3SRB/51r1LAa 1dWzIa+SZ4mokfIvdjHcTPAEIt50/KhnOmctBWrZfF5SmdC8dAgUROzsiLxzVVMiwZ5m MPaHkgrsN6vgFbOSbcutBxovlIifQBpsf/ezzqkfjltCzauVcy3gR9EfqZVZ5pv3pOzf UU/Q== 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=V+5Vz0pOXre1WTDKfJcxhsnViUSpFJqWp7JIiR14uz8=; b=DhsRdFhJZFflw7vd0odUx8mUjRA1VnZaxDxSKpKmzH5aWsGJsjfajbhfrZeatxyTy8 dThUSTkv+b+4P7WBgZ/2EuCW8EeyFZwGFJbevXQjA7QhJpONp3VT5yrkWPDxS+9TUNEK RTGXWJIhAN0UpdMFATWXWoBneFSwn+7/a3xPHyDYUy2RqwsrzmQ2/bPaifQdPTJKU85n bx8Qqb4z7tskyMbJ9ZAzHC/RcRnGNCPwQUavLZim+3zQJaUJ3283Pc7Qet1rTQAYWkS9 2O+Iw3baqA9f5G54ygDHESwxn4BWArZo+4V8FXmi5BoHKAePng5DVazqhlJ0HGSGSoP6 Lqiw== X-Gm-Message-State: AGRZ1gI4BzOEfqhX0Ig82SNZdVrAZF/WzyG/o+ouYItumohsPkEoU7// PPJL1lWfaHdY5T9YmsYjXgWwIA== X-Google-Smtp-Source: AJdET5cUqjXDcy3/iovLT5R49cA+Fs7QwibCApNHb+J2qZz1jL/Z7LyvNucpHBfmtoMKd6W2iZJegQ== X-Received: by 2002:a5e:c902:: with SMTP id z2-v6mr2710094iol.72.1541008799757; Wed, 31 Oct 2018 10:59:59 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 10:59:58 -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 17/30] blk-cgroup: remove legacy queue bypassing Date: Wed, 31 Oct 2018 11:59:09 -0600 Message-Id: <20181031175922.8849-18-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 We only support mq devices now. Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe --- block/blk-cgroup.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 992da5592c6e..5f10d755ec52 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1446,8 +1446,6 @@ int blkcg_activate_policy(struct request_queue *q, if (q->mq_ops) blk_mq_freeze_queue(q); - else - blk_queue_bypass_start(q); pd_prealloc: if (!pd_prealloc) { pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node); @@ -1487,8 +1485,6 @@ int blkcg_activate_policy(struct request_queue *q, out_bypass_end: if (q->mq_ops) blk_mq_unfreeze_queue(q); - else - blk_queue_bypass_end(q); if (pd_prealloc) pol->pd_free_fn(pd_prealloc); return ret; @@ -1513,8 +1509,6 @@ void blkcg_deactivate_policy(struct request_queue *q, if (q->mq_ops) blk_mq_freeze_queue(q); - else - blk_queue_bypass_start(q); spin_lock_irq(q->queue_lock); @@ -1533,8 +1527,6 @@ void blkcg_deactivate_policy(struct request_queue *q, if (q->mq_ops) blk_mq_unfreeze_queue(q); - else - blk_queue_bypass_end(q); } EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);