> On 11 Jul 2025, at 08:43, Andreas Hindborg <a.hindborg@kernel.org> wrote:
>
> The rust null block driver is about to gain some additional modules. Rather
> than pollute the current directory, move the driver to a subdirectory.
>
> Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
> ---
> MAINTAINERS | 2 +-
> drivers/block/Kconfig | 10 +---------
> drivers/block/Makefile | 4 +---
> drivers/block/rnull/Kconfig | 13 +++++++++++++
> drivers/block/rnull/Makefile | 3 +++
> drivers/block/{ => rnull}/rnull.rs | 0
> 6 files changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0c1d245bf7b8..29b14aec3559 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4246,7 +4246,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 0f70e2374e7f..6b50dbc0495b 100644
> --- 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"
> @@ -354,15 +355,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 097707aca725..aba3e93d5014 100644
> --- 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
> @@ -39,6 +36,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
> index 000000000000..6dc5aff96bf4
> --- /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
> index 000000000000..11cfa5e615dc
> --- /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
>
> --
> 2.47.2
>
>
>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>