From: Nitesh Shetty Date: Tue, 1 Mar 2022 21:29:47 +0000 (+0530) Subject: generic/108: use sysfs values for logical,physical block size in scsi_debug X-Git-Tag: v2022.05.01~72 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e076938451cee0385fa8649c0e4630d4be261d71;p=xfstests-dev.git generic/108: use sysfs values for logical,physical block size in scsi_debug scsi_debug device used for test, is created with assumption of 512 bytes logical and physical block size. This causes error in lvcreate step, when SCRATCH_DEV device lba is not 512 bytes. This can be solved by reading block size from sysfs of device. If sysfs is missing fallback to 512 bytes as default. Signed-off-by: Nitesh Shetty Reviewed-by: Luis Chamberlain Signed-off-by: Eryu Guan --- diff --git a/tests/generic/108 b/tests/generic/108 index ad43269f..db0e9bd0 100755 --- a/tests/generic/108 +++ b/tests/generic/108 @@ -42,8 +42,11 @@ _require_non_zoned_device $SCRATCH_DEV lvname=lv_$seq vgname=vg_$seq +physical=$(cat /sys/block/$(_short_dev $SCRATCH_DEV)/queue/physical_block_size) +logical=$(cat /sys/block/$(_short_dev $SCRATCH_DEV)/queue/logical_block_size) + # _get_scsi_debug_dev returns a scsi debug device with 128M in size by default -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 300` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full