block: clean up Kconfig and Makefile
Subsystems (2)
cover block: clean up Kconfig and Makefile
This is a resend of
https://lore.kernel.org/linux-block/[email protected]/#t
Masahiro Yamada (4):
block: remove redundant =y from BLK_CGROUP dependency
block: simplify Kconfig files
block: move menu "Partition type" to block/partitions/Kconfig
block: move CONFIG_BLOCK guard to top Makefile
Makefile | 3 ++- block/Kconfig | 28 ++++++++++------------------ block/Kconfig.iosched | 4 ---- block/Makefile | 2 +- block/partitions/Kconfig | 4 ++++ 5 files changed, 17 insertions(+), 24 deletions(-)
Signature · 1 line
2.30.2
PATCH RESEND 1/4 block: remove redundant =y from BLK_CGROUP dependency
CONFIG_BLK_CGROUP is a boolean option, that is, its value is 'y' or 'n'. The comparison to 'y' is redundant.
---
block/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block/Kconfig +3 -3
@@ -73,7 +73,7 @@ config BLK_DEV_ZONED config BLK_DEV_THROTTLING bool "Block layer bio throttling support" - depends on BLK_CGROUP=y + depends on BLK_CGROUP select BLK_CGROUP_RWSTAT help Block layer bio throttling support. It can be used to limit
@@ -112,7 +112,7 @@ config BLK_WBT_MQ config BLK_CGROUP_IOLATENCY bool "Enable support for latency based cgroup IO protection" - depends on BLK_CGROUP=y + depends on BLK_CGROUP help Enabling this option enables the .latency interface for IO throttling. The IO controller will attempt to maintain average IO latencies below
@@ -132,7 +132,7 @@ config BLK_CGROUP_FC_APPID config BLK_CGROUP_IOCOST bool "Enable support for cost model based cgroup IO controller" - depends on BLK_CGROUP=y + depends on BLK_CGROUP select BLK_RQ_IO_DATA_LEN select BLK_RQ_ALLOC_TIME help
Signature · 1 line
2.30.2
PATCH RESEND 2/4 block: simplify Kconfig files
In reply to Masahiro YamadaEverything under block/ depends on BLOCK. BLOCK_HOLDER_DEPRECATED is selected from drivers/md/Kconfig, which is entirely dependent on BLOCK.
Extend the 'if BLOCK' ... 'endif' so it covers the whole block/Kconfig.
Also, clean up the definition of BLOCK_COMPAT and BLK_MQ_PCI because COMPAT and PCI are boolean.
---
block/Kconfig | 18 +++++++----------- block/Kconfig.iosched | 4 ---- 2 files changed, 7 insertions(+), 15 deletions(-)
block/Kconfig +7 -11
@@ -196,33 +196,29 @@ source "block/partitions/Kconfig" endmenu -endif # BLOCK - config BLOCK_COMPAT - bool - depends on BLOCK && COMPAT - default y + def_bool COMPAT config BLK_MQ_PCI - bool - depends on BLOCK && PCI - default y + def_bool PCI config BLK_MQ_VIRTIO bool - depends on BLOCK && VIRTIO + depends on VIRTIO default y config BLK_MQ_RDMA bool - depends on BLOCK && INFINIBAND + depends on INFINIBAND default y config BLK_PM - def_bool BLOCK && PM + def_bool PM # do not use in new code config BLOCK_HOLDER_DEPRECATED bool source "block/Kconfig.iosched" + +endif # BLOCK
block/Kconfig.iosched +0 -4
@@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -if BLOCK - menu "IO Schedulers" config MQ_IOSCHED_DEADLINE
@@ -45,5 +43,3 @@ config BFQ_CGROUP_DEBUG files in a cgroup which can be useful for debugging. endmenu - -endif
Signature · 1 line
2.30.2
PATCH RESEND 3/4 block: move menu "Partition type" to block/partitions/Kconfig
In reply to Masahiro YamadaMove the menu to the relevant place.
---
block/Kconfig | 4 ---- block/partitions/Kconfig | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)
block/Kconfig +0 -4
@@ -190,12 +190,8 @@ config BLK_INLINE_ENCRYPTION_FALLBACK by falling back to the kernel crypto API when inline encryption hardware is not present. -menu "Partition Types" - source "block/partitions/Kconfig" -endmenu - config BLOCK_COMPAT def_bool COMPAT
block/partitions/Kconfig +4 -0
@@ -2,6 +2,8 @@ # # Partition configuration # +menu "Partition Types" + config PARTITION_ADVANCED bool "Advanced partition selection" help
@@ -267,3 +269,5 @@ config CMDLINE_PARTITION help Say Y here if you want to read the partition table from bootargs. The format for the command line is just like mtdparts. + +endmenu
Signature · 1 line
2.30.2
PATCH RESEND 4/4 block: move CONFIG_BLOCK guard to top Makefile
In reply to Masahiro YamadaEvery object under block/ depends on CONFIG_BLOCK.
Move the guard to the top Makefile since there is no point to descend into block/ if CONFIG_BLOCK=n.
---
Makefile | 3 ++- block/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
Makefile +2 -1
@@ -1115,7 +1115,8 @@ export MODORDER := $(extmod_prefix)modules.order export MODULES_NSDEPS := $(extmod_prefix)modules.nsdeps ifeq ($(KBUILD_EXTMOD),) -core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ +core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ +core-$(CONFIG_BLOCK) += block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
block/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the kernel block layer # -obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ +obj-y := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \ blk-flush.o blk-settings.o blk-ioc.o blk-map.o \ blk-exec.o blk-merge.o blk-timeout.o \ blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
Signature · 1 line
2.30.2
The whole series looks good to me:
Hi Jens,
Quoted 4 lines · Masahiro Yamada
This is a resend of
https://lore.kernel.org/linux-block/[email protected]/#t
ping?
Quoted 18 lines
Masahiro Yamada (4):
block: remove redundant =y fromBLK_CGROUPdependency
block: simplifyKconfigfiles
block: move menu "Partition type" toblock/partitions/Kconfig
block: moveCONFIG_BLOCKguard to topMakefileMakefile | 3 ++- block/Kconfig | 28 ++++++++++------------------ block/Kconfig.iosched | 4 ---- block/Makefile | 2 +- block/partitions/Kconfig | 4 ++++ 5 files changed, 17 insertions(+), 24 deletions(-)--
2.30.2
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 5 lines · Masahiro Yamada
This is a resend of
https://lore.kernel.org/linux-block/[email protected]/#t
Quoted 7 lines
Masahiro Yamada (4):
block: remove redundant =y fromBLK_CGROUPdependency
block: simplifyKconfigfiles
block: move menu "Partition type" toblock/partitions/Kconfig
block: moveCONFIG_BLOCKguard to topMakefile[...]
Applied, thanks!
[1/4] block: remove redundant =y from BLK_CGROUP dependency
commit: 21baefbb1558318bd32b3a5130dd93d76d64df72
[2/4] block: simplify Kconfig files
commit: 59b0555ae1c3ddc506c64ad44efa1841ad5843d7
[3/4] block: move menu "Partition type" to block/partitions/Kconfig
commit: 9b95c675b440156da5b99194e47755728362f4b6
[4/4] block: move CONFIG_BLOCK guard to top Makefile
commit: 782b51ee1f9915942809dea14e7881489cf3ff10Best regards,
Signature · 1 line
Jens Axboe