Occasionally scsi_debug cannot be removed because it's still in use and causes xfs/279 to fail.
Now dryrun the removal by modprobe firstly then do the real rmmod. Signed-off-by: Eryu Guan <[email protected]> --- common/scsi_debug | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/common/scsi_debug b/common/scsi_debug index d073b6d..eb08126 100644 --- a/common/scsi_debug +++ b/common/scsi_debug @@ -57,7 +57,15 @@ _get_scsi_debug_dev() _put_scsi_debug_dev() { - sleep 1 lsmod | grep -wq scsi_debug || return + + n=2 + # 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 + sleep 1 + n=$((n-1)) + done rmmod scsi_debug || _fail "Could not remove scsi_debug module" } -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
