From 1eabfc4809b49b82155f6b92e658d9a6459a37b2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 1 Jun 2022 11:07:41 +0200 Subject: [PATCH] zbd: allow falling back to built-in null_blk Use _configure_null_blk to configure the fallback device and thus allow for a built-in null_blk driver. Signed-off-by: Christoph Hellwig --- tests/zbd/rc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/zbd/rc b/tests/zbd/rc index 9deadc1..fea55d6 100644 --- a/tests/zbd/rc +++ b/tests/zbd/rc @@ -13,7 +13,7 @@ group_requires() { _have_root && _have_program blkzone && _have_program dd && - _have_kernel_option BLK_DEV_ZONED && _have_modules null_blk && + _have_kernel_option BLK_DEV_ZONED && _have_null_blk && _have_module_param null_blk zoned } @@ -25,10 +25,11 @@ group_device_requires() { } _fallback_null_blk_zoned() { - if ! _init_null_blk zone_size=4 gb=1 zoned=1 ; then + if ! _configure_null_blk nullb1 zone_size=4 size=1024 zoned=1 \ + power=1; then return 1 fi - echo /dev/nullb0 + echo /dev/nullb1 } # -- 2.49.0