File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4247,7 +4247,7 @@ W: https://rust-for-linux.com
42474247B: https://github.com/Rust-for-Linux/linux/issues
42484248C: https://rust-for-linux.zulipchat.com/#narrow/stream/Block
42494249T: git https://github.com/Rust-for-Linux/linux.git rust-block-next
4250- F: drivers/block/rnull.rs
4250+ F: drivers/block/rnull/
42514251F: rust/kernel/block.rs
42524252F: rust/kernel/block/
42534253
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ menuconfig BLK_DEV
1717if BLK_DEV
1818
1919source "drivers/block/null_blk/Kconfig"
20+ source "drivers/block/rnull/Kconfig"
2021
2122config 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-
366358config BLK_DEV_RBD
367359 tristate "Rados block device (RBD)"
368360 depends on INET && BLOCK
Original file line number Diff line number Diff line change 99# needed for trace events
1010ccflags-y += -I$(src )
1111
12- obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
13- rnull_mod-y := rnull.o
14-
1512obj-$(CONFIG_MAC_FLOPPY) += swim3.o
1613obj-$(CONFIG_BLK_DEV_SWIM) += swim_mod.o
1714obj-$(CONFIG_BLK_DEV_FD) += floppy.o
@@ -39,6 +36,7 @@ obj-$(CONFIG_ZRAM) += zram/
3936obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/
4037
4138obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/
39+ obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull/
4240
4341obj-$(CONFIG_BLK_DEV_UBLK) += ublk_drv.o
4442obj-$(CONFIG_BLK_DEV_ZONED_LOOP) += zloop.o
Original file line number Diff line number Diff line change 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.
Original file line number Diff line number Diff line change 1+
2+ obj-$(CONFIG_BLK_DEV_RUST_NULL) += rnull_mod.o
3+ rnull_mod-y := rnull.o
File renamed without changes.
You can’t perform that action at this time.
0 commit comments