[PATCH] xfstests: fix internal _xfs_check to handle logdev etc

Eric Sandeen
2013-05-02T14:53:23Z

Pull all of the old xfs_check script into common/rc:_xfs_check()
so that it properly handles all options, including external log
devices.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/common/rc b/common/rc
index 19a0e18..b47a53e 100644
--- a/common/rc
+++ b/common/rc
@@ -393,8 +393,8 @@ _xfs_check()
{
OPTS=" "
DBOPTS=" "
+ USAGE="Usage: xfs_check [-fsvV] [-l logdev] [-i ino]... [-b bno]... special"

- OPTIND=1
while getopts "b:fi:l:stvV" c
do
case $c in
@@ -410,8 +410,17 @@ _xfs_check()
;;
esac
done
- ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1
- return $?
+ set -- extra $@
+ shift $OPTIND
+ case $# in
+ 1) ${XFS_DB_PROG}${DBOPTS} -F -i -p xfs_check -c "check$OPTS" $1
+ status=$?
+ ;;
+ 2) echo $USAGE 1>&1
+ status=2
+ ;;
+ esac
+ return $status
}

_setup_large_ext4_fs()