common/scsi_debug: use udevadm settle instead of sleeping

[xfstests-dev.git] / common / scsi_debug

diff --git a/common/scsi_debug b/common/scsi_debug
index d9aa0bd253fc5219dca9c59c9cbf59c77eb78b71..e79884690284fd4618338982786773018b40c3e6 100644 (file)
--- a/common/scsi_debug
+++ b/common/scsi_debug
@@ -36,7 +36,7 @@ _get_scsi_debug_dev()
        echo "scsi_debug options $opts" >> $seqres.full
        modprobe scsi_debug $opts
        [ $? -eq 0 ] || _fail "scsi_debug modprobe failed"
-       sleep 1
+       $UDEV_SETTLE_PROG
        device=`grep -wl scsi_debug /sys/block/sd*/device/model | awk -F / '{print $4}'`
        echo "/dev/$device"
 }
@@ -50,7 +50,7 @@ _put_scsi_debug_dev()
        # modprobe is only quiet when the module is not found, not when the
        # module is in use.
        while [ $n -ge 0 ] && ! modprobe -nr scsi_debug >/dev/null 2>&1; do
-               sleep 1
+               $UDEV_SETTLE_PROG
                n=$((n-1))
        done
        rmmod scsi_debug || _fail "Could not remove scsi_debug module"