Skip to content

Commit f2cfe92

Browse files
Andreas Hindborgkawasaki
authored andcommitted
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. Signed-off-by: Andreas Hindborg <[email protected]>
1 parent 67dcf4e commit f2cfe92

6 files changed

Lines changed: 19 additions & 13 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4247,7 +4247,7 @@ W: https://rust-for-linux.com
42474247
B: https://github.com/Rust-for-Linux/linux/issues
42484248
C: https://rust-for-linux.zulipchat.com/#narrow/stream/Block
42494249
T: git https://github.com/Rust-for-Linux/linux.git rust-block-next
4250-
F: drivers/block/rnull.rs
4250+
F: drivers/block/rnull/
42514251
F: rust/kernel/block.rs
42524252
F: rust/kernel/block/
42534253

drivers/block/Kconfig

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ menuconfig BLK_DEV
1717
if BLK_DEV
1818

1919
source "drivers/block/null_blk/Kconfig"
20+
source "drivers/block/rnull/Kconfig"
2021

2122
config BLK_DEV_FD
2223
tristate "Normal floppy disk support"
@@ -354,15 +355,6 @@ config VIRTIO_BLK
354355
This is the virtual block driver for virtio. It can be used with
355356
QEMU based VMMs (like KVM or Xen). Say Y or M.
356357

357-
config BLK_DEV_RUST_NULL
358-
tristate "Rust null block driver (Experimental)"
359-
depends on RUST
360-
help
361-
This is the Rust implementation of the null block driver. For now it
362-
is only a minimal stub.
363-
364-
If unsure, say N.
365-
366358
config BLK_DEV_RBD
367359
tristate "Rados block device (RBD)"
368360
depends on INET && BLOCK

drivers/block/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
# needed for trace events
1010
ccflags-y += -I$(src)
1111

12-
obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
13-
rnull_mod-y := rnull.o
14-
1512
obj-$(CONFIG_MAC_FLOPPY) += swim3.o
1613
obj-$(CONFIG_BLK_DEV_SWIM) += swim_mod.o
1714
obj-$(CONFIG_BLK_DEV_FD) += floppy.o
@@ -39,6 +36,7 @@ obj-$(CONFIG_ZRAM) += zram/
3936
obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/
4037

4138
obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/
39+
obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull/
4240

4341
obj-$(CONFIG_BLK_DEV_UBLK) += ublk_drv.o
4442
obj-$(CONFIG_BLK_DEV_ZONED_LOOP) += zloop.o

drivers/block/rnull/Kconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Rust null block device driver configuration
4+
5+
config BLK_DEV_RUST_NULL
6+
tristate "Rust null block driver (Experimental)"
7+
depends on RUST
8+
help
9+
This is the Rust implementation of the null block driver. Like
10+
the C version, the driver allows the user to create virutal block
11+
devices that can be configured via various configuration options.
12+
13+
If unsure, say N.

drivers/block/rnull/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
3+
rnull_mod-y := rnull.o

0 commit comments

Comments
 (0)