public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] common/scsi_debug: make sure scsi_debug been removed correctly
@ 2019-01-09  5:48 yangerkun
  2019-01-09 21:02 ` Dave Chinner
  0 siblings, 1 reply; 7+ messages in thread
From: yangerkun @ 2019-01-09  5:48 UTC (permalink / raw)
  To: guaneryu; +Cc: houtao1, yangerkun, fstests

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@huawei.com>
---
 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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-01-15  6:08 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09  5:48 [PATCH] common/scsi_debug: make sure scsi_debug been removed correctly yangerkun
2019-01-09 21:02 ` Dave Chinner
2019-01-12  2:20   ` yangerkun
2019-01-13 15:21     ` Eryu Guan
2019-01-15  3:47     ` Dave Chinner
2019-01-15  5:31       ` yangerkun
2019-01-15  6:08         ` Dave Chinner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox