rnull: move driver to separate directory

The rust null block driver is about to gain some additional modules. Rather
than pollute the current directory, move the driver to a subdirectory.

Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
Link: https://lore.kernel.org/r/20250902-rnull-up-v6-16-v7-12-b5212cc89b98@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/MAINTAINERS b/MAINTAINERS
index fed6cd812d796a08cebc0c1fd540c8901d1bf448..7f3121d0a7849acd8249fabee5abac88db2abbaa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4343,7 +4343,7 @@ W:        https://rust-for-linux.com
 B:     https://github.com/Rust-for-Linux/linux/issues
 C:     https://rust-for-linux.zulipchat.com/#narrow/stream/Block
 T:     git https://github.com/Rust-for-Linux/linux.git rust-block-next
-F:     drivers/block/rnull.rs
+F:     drivers/block/rnull/
 F:     rust/kernel/block.rs
 F:     rust/kernel/block/
 

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index df38fb364904637e84599b5be44337862bf3cd92..77d6944489905b0e21659f27fcae3c5b541d8f95 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -17,6 +17,7 @@ menuconfig BLK_DEV
 if BLK_DEV
 
 source "drivers/block/null_blk/Kconfig"
+source "drivers/block/rnull/Kconfig"
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"
@@ -311,15 +312,6 @@ config VIRTIO_BLK
          This is the virtual block driver for virtio.  It can be used with
           QEMU based VMMs (like KVM or Xen).  Say Y or M.
 
-config BLK_DEV_RUST_NULL
-       tristate "Rust null block driver (Experimental)"
-       depends on RUST
-       help
-         This is the Rust implementation of the null block driver. For now it
-         is only a minimal stub.
-
-         If unsure, say N.
-
 config BLK_DEV_RBD
        tristate "Rados block device (RBD)"
        depends on INET && BLOCK

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a695ce74ef2281863bf4a50ce847072b1edb7ed3..2d8096eb8cdf88b21db98fce06c9b38791eaf6c5 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -9,9 +9,6 @@
 # needed for trace events
 ccflags-y                              += -I$(src)
 
-obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
-rnull_mod-y := rnull.o
-
 obj-$(CONFIG_MAC_FLOPPY)       += swim3.o
 obj-$(CONFIG_BLK_DEV_SWIM)     += swim_mod.o
 obj-$(CONFIG_BLK_DEV_FD)       += floppy.o
@@ -38,6 +35,7 @@ obj-$(CONFIG_ZRAM) += zram/
 obj-$(CONFIG_BLK_DEV_RNBD)     += rnbd/
 
 obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/
+obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull/
 
 obj-$(CONFIG_BLK_DEV_UBLK)                     += ublk_drv.o
 obj-$(CONFIG_BLK_DEV_ZONED_LOOP) += zloop.o

diff --git a/drivers/block/rnull/Kconfig b/drivers/block/rnull/Kconfig
new file mode 100644 (file)
index 0000000..6dc5aff
--- /dev/null
+++ b/drivers/block/rnull/Kconfig
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Rust null block device driver configuration
+
+config BLK_DEV_RUST_NULL
+       tristate "Rust null block driver (Experimental)"
+       depends on RUST
+       help
+         This is the Rust implementation of the null block driver. Like
+         the C version, the driver allows the user to create virutal block
+         devices that can be configured via various configuration options.
+
+         If unsure, say N.

diff --git a/drivers/block/rnull/Makefile b/drivers/block/rnull/Makefile
new file mode 100644 (file)
index 0000000..11cfa5e
--- /dev/null
+++ b/drivers/block/rnull/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
+rnull_mod-y := rnull.o

diff --git a/drivers/block/rnull.rs b/drivers/block/rnull/rnull.rs
similarity index 100%
rename from drivers/block/rnull.rs
rename to drivers/block/rnull/rnull.rs