Skip to contentSkip to conversation

null_blk: Move the null_blk source files into a subdirectory

PATCH In review Bart Van Assche 4 participants 4 messages Jun 21, 2020 – Jun 22, 2020 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 null_blk: Move the null_blk source files into a subdirectory

Since the number of source files of the null_blk driver keeps growing, move these source files into a new subdirectory.

Cc Christoph Hellwig <[email protected]>
Cc Daniel Wagner <[email protected]>
Cc Dongli Zhang <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc Johannes Thumshirn <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
 drivers/block/Kconfig                         | 8 +-------
 drivers/block/Makefile                        | 7 +------
 drivers/block/null_blk/Kconfig                | 9 +++++++++
 drivers/block/null_blk/Makefile               | 8 ++++++++
 drivers/block/{ => null_blk}/null_blk.h       | 0
 drivers/block/{ => null_blk}/null_blk_main.c  | 0
 drivers/block/{ => null_blk}/null_blk_trace.c | 0
 drivers/block/{ => null_blk}/null_blk_trace.h | 0
 drivers/block/{ => null_blk}/null_blk_zoned.c | 0
 9 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 drivers/block/null_blk/Kconfig
 create mode 100644 drivers/block/null_blk/Makefile
 rename drivers/block/{ => null_blk}/null_blk.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_main.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_zoned.c (100%)
drivers/block/Kconfig +1 -7
index ecceaaa1a66f..262326973ee0 100644
@@ -16,13 +16,7 @@ menuconfig BLK_DEV
 
 if BLK_DEV
 
-config BLK_DEV_NULL_BLK
-	tristate "Null test block driver"
-	select CONFIGFS_FS
-
-config BLK_DEV_NULL_BLK_FAULT_INJECTION
-	bool "Support fault injection for Null test block driver"
-	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION
+source "drivers/block/null_blk/Kconfig"
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
drivers/block/Makefile +1 -6
index e1f63117ee94..31bc2cfa342f 100644
@@ -41,12 +41,7 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 obj-$(CONFIG_ZRAM) += zram/
 obj-$(CONFIG_BLK_DEV_RNBD)	+= rnbd/
 
-obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
-null_blk-objs	:= null_blk_main.o
-ifeq ($(CONFIG_BLK_DEV_ZONED), y)
-null_blk-$(CONFIG_TRACING) += null_blk_trace.o
-endif
-null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
+obj-$(CONFIG_BLK_DEV)		+= null_blk/
 
 skd-y		:= skd_main.o
 swim_mod-y	:= swim.o swim_asm.o
drivers/block/null_blk/Kconfig new file +9 -0
new file mode 100644
index 000000000000..1ce02a3572bd
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config BLK_DEV_NULL_BLK
+	tristate "Null test block driver"
+	select CONFIGFS_FS
+
+config BLK_DEV_NULL_BLK_FAULT_INJECTION
+	bool "Support fault injection for Null test block driver"
+	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION
drivers/block/null_blk/Makefile new file +8 -0
new file mode 100644
index 000000000000..a93a16d5ba23
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
+null_blk-objs			:= null_blk_main.o
+ifeq ($(CONFIG_BLK_DEV_ZONED), y)
+null_blk-$(CONFIG_TRACING)	+= null_blk_trace.o
+endif
+null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
drivers/block/null_blk/null_blk.h renamed from drivers/block/null_blk.h +0 -0
similarity index 100%
rename from drivers/block/null_blk.h
rename to drivers/block/null_blk/null_blk.h
drivers/block/null_blk/null_blk_main.c renamed from drivers/block/null_blk_main.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_main.c
rename to drivers/block/null_blk/null_blk_main.c
drivers/block/null_blk/null_blk_trace.c renamed from drivers/block/null_blk_trace.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_trace.c
rename to drivers/block/null_blk/null_blk_trace.c
drivers/block/null_blk/null_blk_trace.h renamed from drivers/block/null_blk_trace.h +0 -0
similarity index 100%
rename from drivers/block/null_blk_trace.h
rename to drivers/block/null_blk/null_blk_trace.h
drivers/block/null_blk/null_blk_zoned.c renamed from drivers/block/null_blk_zoned.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_zoned.c
rename to drivers/block/null_blk/null_blk_zoned.c
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Bart Van Assche

Since the number of source files of the null_blk driver keeps growing, move these source files into a new subdirectory.

Makes sense.

Quoted 114 lines
Cc Christoph Hellwig <[email protected]>
Cc Daniel Wagner <[email protected]>
Cc Dongli Zhang <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc Johannes Thumshirn <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
 drivers/block/Kconfig                         | 8 +-------
 drivers/block/Makefile                        | 7 +------
 drivers/block/null_blk/Kconfig                | 9 +++++++++
 drivers/block/null_blk/Makefile               | 8 ++++++++
 drivers/block/{ => null_blk}/null_blk.h       | 0
 drivers/block/{ => null_blk}/null_blk_main.c  | 0
 drivers/block/{ => null_blk}/null_blk_trace.c | 0
 drivers/block/{ => null_blk}/null_blk_trace.h | 0
 drivers/block/{ => null_blk}/null_blk_zoned.c | 0
 9 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 drivers/block/null_blk/Kconfig
 create mode 100644 drivers/block/null_blk/Makefile
 rename drivers/block/{ => null_blk}/null_blk.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_main.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_zoned.c (100%)
drivers/block/Kconfig +1 -7
index ecceaaa1a66f..262326973ee0 100644
@@ -16,13 +16,7 @@ menuconfig BLK_DEV
 
 if BLK_DEV
 
-config BLK_DEV_NULL_BLK
-	tristate "Null test block driver"
-	select CONFIGFS_FS
-
-config BLK_DEV_NULL_BLK_FAULT_INJECTION
-	bool "Support fault injection for Null test block driver"
-	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION
+source "drivers/block/null_blk/Kconfig"
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
drivers/block/Makefile +1 -6
index e1f63117ee94..31bc2cfa342f 100644
@@ -41,12 +41,7 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 obj-$(CONFIG_ZRAM) += zram/
 obj-$(CONFIG_BLK_DEV_RNBD)	+= rnbd/
 
-obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
-null_blk-objs	:= null_blk_main.o
-ifeq ($(CONFIG_BLK_DEV_ZONED), y)
-null_blk-$(CONFIG_TRACING) += null_blk_trace.o
-endif
-null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
+obj-$(CONFIG_BLK_DEV)		+= null_blk/
 
 skd-y		:= skd_main.o
 swim_mod-y	:= swim.o swim_asm.o
drivers/block/null_blk/Kconfig new file +9 -0
new file mode 100644
index 000000000000..1ce02a3572bd
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+
+config BLK_DEV_NULL_BLK
+	tristate "Null test block driver"
+	select CONFIGFS_FS
+
+config BLK_DEV_NULL_BLK_FAULT_INJECTION
+	bool "Support fault injection for Null test block driver"
+	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION
drivers/block/null_blk/Makefile new file +8 -0
new file mode 100644
index 000000000000..a93a16d5ba23
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
+null_blk-objs			:= null_blk_main.o
+ifeq ($(CONFIG_BLK_DEV_ZONED), y)
+null_blk-$(CONFIG_TRACING)	+= null_blk_trace.o
+endif
+null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o
drivers/block/null_blk/null_blk.h renamed from drivers/block/null_blk.h +0 -0
similarity index 100%
rename from drivers/block/null_blk.h
rename to drivers/block/null_blk/null_blk.h
drivers/block/null_blk/null_blk_main.c renamed from drivers/block/null_blk_main.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_main.c
rename to drivers/block/null_blk/null_blk_main.c
drivers/block/null_blk/null_blk_trace.c renamed from drivers/block/null_blk_trace.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_trace.c
rename to drivers/block/null_blk/null_blk_trace.c
drivers/block/null_blk/null_blk_trace.h renamed from drivers/block/null_blk_trace.h +0 -0
similarity index 100%
rename from drivers/block/null_blk_trace.h
rename to drivers/block/null_blk/null_blk_trace.h
drivers/block/null_blk/null_blk_zoned.c renamed from drivers/block/null_blk_zoned.c +0 -0
similarity index 100%
rename from drivers/block/null_blk_zoned.c
rename to drivers/block/null_blk/null_blk_zoned.c
Signature · 2 lines
Damien Le Moal
Western Digital Research
maintainer
#2 lore raw
In reply to Bart Van Assche
Quoted 20 lines · Bart Van Assche

Since the number of source files of the null_blk driver keeps growing, move these source files into a new subdirectory.

Cc Christoph Hellwig <[email protected]>
Cc Daniel Wagner <[email protected]>
Cc Dongli Zhang <[email protected]>
Cc Damien Le Moal <[email protected]>
Cc Johannes Thumshirn <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
---
 drivers/block/Kconfig                         | 8 +-------
 drivers/block/Makefile                        | 7 +------
 drivers/block/null_blk/Kconfig                | 9 +++++++++
 drivers/block/null_blk/Makefile               | 8 ++++++++
 drivers/block/{ => null_blk}/null_blk.h       | 0
 drivers/block/{ => null_blk}/null_blk_main.c  | 0
 drivers/block/{ => null_blk}/null_blk_trace.c | 0
 drivers/block/{ => null_blk}/null_blk_trace.h | 0
 drivers/block/{ => null_blk}/null_blk_zoned.c | 0
Quoted 8 lines
 9 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 drivers/block/null_blk/Kconfig
 create mode 100644 drivers/block/null_blk/Makefile
 rename drivers/block/{ => null_blk}/null_blk.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_main.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.c (100%)
 rename drivers/block/{ => null_blk}/null_blk_trace.h (100%)
 rename drivers/block/{ => null_blk}/null_blk_zoned.c (100%)

I'm all for this since, but why not name them null_blk/main.c etc? A bit annoying/redundant to have them be drivers/block/null_blk/null_main.c and so forth.

Probably have null_blk.h be the exception.

Signature · 1 line
Jens Axboe