From: Eryu Guan <eguan@redhat.com>
Date: Mon, 11 Jan 2016 04:08:20 +0000 (+1100)
Subject: common/scsi_debug: fix removal of scsi_debug module
X-Git-Tag: v2022.05.01~2683
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ef1932867e2a1ca25451157c20300d10cb4e369d;p=xfstests-dev.git

common/scsi_debug: fix removal of scsi_debug module

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 <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/common/scsi_debug b/common/scsi_debug
index d073b6d9..eb08126f 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"
 }