From patchwork Mon Oct 29 16:34:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10659631 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 52B9713B5 for ; Mon, 29 Oct 2018 16:35:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3634829BAA for ; Mon, 29 Oct 2018 16:35:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A7DC29C41; Mon, 29 Oct 2018 16:35:26 +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 CBF9B29BAA for ; Mon, 29 Oct 2018 16:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728037AbeJ3BYp (ORCPT ); Mon, 29 Oct 2018 21:24:45 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:41924 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727872AbeJ3BYo (ORCPT ); Mon, 29 Oct 2018 21:24:44 -0400 Received: by mail-io1-f66.google.com with SMTP id q4-v6so5357126iob.8 for ; Mon, 29 Oct 2018 09:35:23 -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=QlBDzNph21+o+VK4goPO6rlXlmuhPuRpC8SbRbbMUhJE4mtnnEmbWmjxCFQ5dpaYYz +oNWv24KgVfTGZihz0YJxuLRlmortOufE44elFsMmsRpguT9Pi34z0pjFVt9bF0BsBXD ji3mxJ+hvPTwOXqxpAE0uNtF9G+AAQMb6zRFUbTbhrLU5upKbiTGZxsqeskIX26OsHlc qtbx1dCOVHv1PhU65V3uxpbsJj1o7N1OV3e4Xq4U1QY9gK6KMBFGpgxLSYKuP9fB/xY+ huUrr7gXE4/lbEDcXgtG6N58azwEJK3M3VYWip19M97Yr3XjpN0THDzPtvHiugGaAy1B OKPA== 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=k4ZXJRCFklisPo3czfDhXVLSVLjwztwd8TBNlHFdqrkg/4Q4t6lvX5XDM9HmWx0wjH 9Ve8nZNk0+wwZOYfenmei4/lrQR13AMivsMzSnatsdLjPSeAXpn/EmDxEADR5tRtiTfR KIe8cOWiluak+oBGvKuaujN0jLuQ72lSa9Lq/k6SV/H/ajGpPdM/9TLkaZFkt05TcF7i sxr5Xpd8izW5WTrihZVSKUHWXgz7lpm0LzwaaiXOeYwjLH98+7uHlCBZ9rInLSozNFZ6 n6z/whIiuZHuO34fl5bW4ZqmY2Cp6EcT08s1yz2Fz/RGp9wP5hpplJ3pO4VcJ1UfGD1g pqWg== X-Gm-Message-State: AGRZ1gKqbLXnTpFqanlxiUbjC1JI7dHqK7p+KwOAFSf9bSajBqckVfZe +ys1IXN5d1PxLUg98gV/xDEKQw== X-Google-Smtp-Source: AJdET5cq9/CTo08IGWfs7NnoBBU2KTfMm4o+4M1KNBVr8QTu8QVgglwyj2jaKQ6eUmLVgy9Sjko6bw== X-Received: by 2002:a6b:c042:: with SMTP id q63-v6mr8861011iof.6.1540830923121; Mon, 29 Oct 2018 09:35:23 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:35:21 -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 17/29] blk-cgroup: remove legacy queue bypassing Date: Mon, 29 Oct 2018 10:34:32 -0600 Message-Id: <20181029163444.9940-18-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 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);