From: Eric Sandeen <sandeen@redhat.com>
To: xfs-oss <xfs@oss.sgi.com>
Cc: Dave Chinner <dchinner@redhat.com>
Subject: [PATCH V2] xfstests: clean up scsi_debug module handling
Date: Thu, 08 Mar 2012 18:05:03 -0600 [thread overview]
Message-ID: <4F59492F.6020007@redhat.com> (raw)
In-Reply-To: <4F59461B.7040608@redhat.com>
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 <sandeen@redhat.com>
---
Argh.
diff --git a/common.scsi_debug b/common.scsi_debug
index 9f9177c..a085a67 100644
--- a/common.scsi_debug
+++ b/common.scsi_debug
@@ -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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2012-03-09 0:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 23:51 [PATCH] xfstests: test for scsi_debug before trying to rmmod it Eric Sandeen
2012-03-09 0:05 ` Eric Sandeen [this message]
2012-03-09 17:27 ` [PATCH V2] xfstests: clean up scsi_debug module handling Ben Myers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F59492F.6020007@redhat.com \
--to=sandeen@redhat.com \
--cc=dchinner@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.