Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Juerg Haefliger <juerg.haefliger@canonical.com>
To:     Christoph Hellwig <hch@infradead.org>,
        Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org,
        Juerg Haefliger <juergh@canonical.com>
Subject: [PATCH v2 1/3] init/Kconfig: Move BLK_CGROUP to block/Kconfig
Date:   Wed, 19 May 2021 10:56:13 +0200
Message-Id: <20210519085615.12101-2-juergh@canonical.com>
In-Reply-To: <20210519085615.12101-1-juergh@canonical.com>
References: <20210519085615.12101-1-juergh@canonical.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

While at it, make the option prompt more descriptive and fix the help
text indentation to be 1 tab + 2 spaces.

Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 block/Kconfig | 23 +++++++++++++++++++++++
 init/Kconfig  | 22 ----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/block/Kconfig b/block/Kconfig
index a2297edfdde8..fbc4cf1a2075 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -202,6 +202,29 @@ config BLK_INLINE_ENCRYPTION_FALLBACK
 	  by falling back to the kernel crypto API when inline
 	  encryption hardware is not present.
 
+config BLK_CGROUP
+	bool "Enable block IO cgroup controller"
+	depends on CGROUPS
+	default n
+	help
+	  Generic block IO controller cgroup interface. This is the common
+	  cgroup interface which should be used by various IO controlling
+	  policies.
+
+	  Currently, CFQ IO scheduler uses it to recognize task groups and
+	  control disk bandwidth allocation (proportional time slice allocation)
+	  to such task groups. It is also used by bio throttling logic in
+	  block layer to implement upper limit in IO rates on a device.
+
+	  This option only enables generic Block IO controller infrastructure.
+	  One needs to also enable actual IO controlling logic/policy. For
+	  enabling proportional weight division of disk bandwidth in CFQ, set
+	  CONFIG_BFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
+	  CONFIG_BLK_DEV_THROTTLING=y.
+
+	  See Documentation/admin-guide/cgroup-v1/blkio-controller.rst for more
+	  information.
+
 menu "Partition Types"
 
 source "block/partitions/Kconfig"
diff --git a/init/Kconfig b/init/Kconfig
index 1ea12c64e4c9..5be10c091603 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -921,28 +921,6 @@ config MEMCG_KMEM
 	depends on MEMCG && !SLOB
 	default y
 
-config BLK_CGROUP
-	bool "IO controller"
-	depends on BLOCK
-	default n
-	help
-	Generic block IO controller cgroup interface. This is the common
-	cgroup interface which should be used by various IO controlling
-	policies.
-
-	Currently, CFQ IO scheduler uses it to recognize task groups and
-	control disk bandwidth allocation (proportional time slice allocation)
-	to such task groups. It is also used by bio throttling logic in
-	block layer to implement upper limit in IO rates on a device.
-
-	This option only enables generic Block IO controller infrastructure.
-	One needs to also enable actual IO controlling logic/policy. For
-	enabling proportional weight division of disk bandwidth in CFQ, set
-	CONFIG_BFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
-	CONFIG_BLK_DEV_THROTTLING=y.
-
-	See Documentation/admin-guide/cgroup-v1/blkio-controller.rst for more information.
-
 config CGROUP_WRITEBACK
 	bool
 	depends on MEMCG && BLK_CGROUP
-- 
2.27.0