From patchwork Thu Oct 25 21:10:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 989359 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="wKBEKNQR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42h0D519C6z9sBq for ; Fri, 26 Oct 2018 08:11:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727516AbeJZFpe (ORCPT ); Fri, 26 Oct 2018 01:45:34 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:34069 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727475AbeJZFpd (ORCPT ); Fri, 26 Oct 2018 01:45:33 -0400 Received: by mail-it1-f194.google.com with SMTP id e81-v6so3044648itc.1 for ; Thu, 25 Oct 2018 14:11:15 -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=riSa/XmRDf7tNJepdUKIvyeJjY9wUJADnK+ZzQPKT7Y=; b=wKBEKNQR4WNsFmR0pTLekevi0eMENA1X/q8youYguN+t/VPbZHA2G8KwBpUo2mOEWh KTOqO51DyDmns5e2ezwQMD9qoCYO6NORD2k4eqT5R9BN53FIOesm/dT0gTgxNPeYd94u NloephoUDnov0ryz5DuLSZuKXE3JEEamh3EhcQgA09lMCpCDhMu1AKj3MUDPTD0zNUVG Nt33WX3sBWtihq7ov0i72n0ycIfoX6786qDZ1J6HQdp8IKD4yTNHzK19eZkmQRNg0TCN Cr2Mjq8ucCJLFJa4kKY7cMTQmluJoIPofD6RtcX6DQsOi4TWmUNzFENB4/IU+f2URfwd asrg== 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=riSa/XmRDf7tNJepdUKIvyeJjY9wUJADnK+ZzQPKT7Y=; b=P6b+AJBmBAj44oeP25JQuvu1vdSIIj9zRh0Db8KoGXc6FcLdySnfZxm51kuewusaQJ UUHvc32ubUYyz/p8qGuhrETpsbLDwpwk4Om5N3EcxYxmGLKzU31JYQ9dengepmQPZalt l1p/S5Ts21UE7EJxMvvLWWOFGxv2X5auQQMcSySQ0ARyNSohVSvwFeKIiyPzIlXkrA8+ Vb0a0o5OZRPUy4wfGWZdzhUgt/Mq9o91gNIckUK02OozOzGABCaxQZX2Tjci4cpijA+Z jjycxJzdrX0gaau6p2rl7Xh3LTsWJ0QGTz1nZQKlTTy/nAJKZloa622vO+DwzUedJerZ lDnA== X-Gm-Message-State: AGRZ1gJkDyzLCdFhL3l7D4Y+4qpcVcpCu8WxkH6gg42j6WlEr3CsmYxn WNv3AgOXwCpuJvE9HNw3iO/BPw== X-Google-Smtp-Source: AJdET5fq0h2S5NAygTbp/oT55bBih3wyWKiKGZCMEhyDg8uNQv8dr9BVoNxoHwUDqt4B3uOSSutQzQ== X-Received: by 2002:a24:95c4:: with SMTP id m187-v6mr2145031itd.83.1540501875452; Thu, 25 Oct 2018 14:11:15 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id e65-v6sm3446375ioa.76.2018.10.25.14.11.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 14:11:14 -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/28] blk-cgroup: remove legacy queue bypassing Date: Thu, 25 Oct 2018 15:10:27 -0600 Message-Id: <20181025211039.11559-17-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025211039.11559-1-axboe@kernel.dk> References: <20181025211039.11559-1-axboe@kernel.dk> Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org We only support mq devices now. Signed-off-by: Jens Axboe Reviewed-by: Hannes Reinecke --- 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);