Case generic/108 sometimes will fail while testing ext2, and the reson
is that rmmod scsi_debug in _put_scsi_debug_dev may randomly fail. Now
add the loop to do rmmod to make sure scsi_debug can be removed
correctly.
Signed-off-by: yangerkun <yangerkun@xxxxxxxxxx>
---
common/scsi_debug | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/scsi_debug b/common/scsi_debug
index d9aa0bd..890ec68 100644
--- a/common/scsi_debug
+++ b/common/scsi_debug
@@ -45,11 +45,13 @@ _put_scsi_debug_dev()
{
lsmod | grep -wq scsi_debug || return
- n=2
+ n=15
# use redirection not -q option of modprobe here, because -q of old
# 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
+ while [ $n -ge 0 ]; do
+ modprobe -r scsi_debug >/dev/null 2>&1
+ [ $? -eq 0 ] && return 0
sleep 1
n=$((n-1))
done
--
2.9.5
