From 9ffe433d729101a34d9709030d7d4dd2444347ef Mon Sep 17 00:00:00 2001 From: Shin'ichiro Kawasaki Date: Tue, 14 Dec 2021 10:24:13 +0900 Subject: [PATCH] t/zbd: Avoid inappropriate blkzone command call in zone_cap_bs When the script test-zbd-support is run for regular block devices or SG nodes, blkzone command shall not be called. However, zone_cap_bs() helper function calls the command regardless of the zone model or device type, and results in error messages such as "unable to determine zone size" or "not a block device". Avoid the command call by returning the zone size argument passed to this function when the test device is a regular block device or a SG node. Fixes: 1ae82d673cf5 ("t/zbd: Align block size to zone capacity") Signed-off-by: Shin'ichiro Kawasaki Signed-off-by: Damien Le Moal Reviewed-by: Niklas Cassel Link: https://lore.kernel.org/r/20211214012413.464798-13-damien.lemoal@opensource.wdc.com Signed-off-by: Jens Axboe --- t/zbd/functions | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/zbd/functions b/t/zbd/functions index e4e248b9..7cff18fd 100644 --- a/t/zbd/functions +++ b/t/zbd/functions @@ -72,9 +72,11 @@ zone_cap_bs() { local sed_str='s/.*len \([0-9A-Za-z]*\), cap \([0-9A-Za-z]*\).*/\1 \2/p' local cap bs="$zone_size" - # When blkzone is not available or blkzone does not report capacity, + # When blkzone command is neither available nor relevant to the + # test device, or when blkzone command does not report capacity, # assume that zone capacity is same as zone size for all zones. - if [ -z "${blkzone}" ] || ! blkzone_reports_capacity "${dev}"; then + if [ -z "${blkzone}" ] || [ -z "$is_zbd" ] || [ -c "$dev" ] || + ! blkzone_reports_capacity "${dev}"; then echo "$zone_size" return fi -- 2.25.1