Skip to contentSkip to conversation

xfstests: test for scsi_debug before trying to rmmod it

PATCH New Eric Sandeen 2 participants 3 messages Mar 9, 2012

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 xfstests: test for scsi_debug before trying to rmmod it

_cleanup does _put_scsi_debug_dev but there's a chance the module has already been removed in the non-error case.

If it's not loaded, don't try to rmmod it.

Signed-off-by Eric Sandeen <[email protected]>

---

common.scsi_debug +1 -0
index 9f9177c..08efa58 100644
@@ -58,5 +58,6 @@ _get_scsi_debug_dev()
 _put_scsi_debug_dev()
 {
 	sleep 1
+	grep -q scsi_debug /proc/modules || return
 	rmmod scsi_debug || _fail "Could not remove scsi_debug module"
 }

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

author
#1 lore raw

PATCH v2 1/1 xfstests: clean up scsi_debug module handling

2 little fixes to common scsi_debug handling.

* don't consider the scsi_debug module in use in _require, unless it can't be rmmod'd
* don't try to rmmod it in _put unless it is currently loaded

Signed-off-by Eric Sandeen <[email protected]>

---

Argh.

common.scsi_debug +2 -1
index 9f9177c..a085a67 100644
@@ -26,7 +26,7 @@ _require_scsi_debug()
 {
 	# make sure we have the module and it's not already used
 	modinfo scsi_debug 2>&1 > /dev/null || _notrun "scsi_debug module not found"
-	lsmod | grep -wq scsi_debug && _notrun "scsi_debug module in use"
+	lsmod | grep -wq scsi_debug && (rmmod scsi_debug || _notrun "scsi_debug module in use")
 	# make sure it has the features we need
 	# logical/physical sectors plus unmap support all went in together
 	modinfo scsi_debug | grep -wq sector_size || _notrun "scsi_debug too old"

@@ -58,5 +58,6 @@ _get_scsi_debug_dev()
 _put_scsi_debug_dev()
 {
 	sleep 1
+	lsmod | grep -wq scsi_debug || return
 	rmmod scsi_debug || _fail "Could not remove scsi_debug module"
 }

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v2 1/1
#2 lore raw

Re: [PATCH V2] xfstests: clean up scsi_debug module handling

Hey Eric,

Quoted 8 lines · Eric Sandeen

2 little fixes to common scsi_debug handling.

* don't consider the scsi_debug module in use in _require, unless it can't be rmmod'd
* don't try to rmmod it in _put unless it is currently loaded

Signed-off-by Eric Sandeen <[email protected]>

This looks good to me.

Reviewed-by Ben Myers <[email protected]>
Quoted 25 lines

---

Argh.

common.scsi_debug +2 -1
index 9f9177c..a085a67 100644
@@ -26,7 +26,7 @@ _require_scsi_debug()
 {
 	# make sure we have the module and it's not already used
 	modinfo scsi_debug 2>&1 > /dev/null || _notrun "scsi_debug module not found"
-	lsmod | grep -wq scsi_debug && _notrun "scsi_debug module in use"
+	lsmod | grep -wq scsi_debug && (rmmod scsi_debug || _notrun "scsi_debug module in use")
 	# make sure it has the features we need
 	# logical/physical sectors plus unmap support all went in together
 	modinfo scsi_debug | grep -wq sector_size || _notrun "scsi_debug too old"

@@ -58,5 +58,6 @@ _get_scsi_debug_dev()
 _put_scsi_debug_dev()
 {
 	sleep 1
+	lsmod | grep -wq scsi_debug || return
 	rmmod scsi_debug || _fail "Could not remove scsi_debug module"
 }
Quoted 4 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs