From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 2 May 2013 14:53:19 +0000 (+0000)
Subject: xfstests: fix internal _xfs_check to handle logdev etc
X-Git-Tag: v2022.05.01~3442
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=120752942a542742a32aafa2cd5d247f3e0d1479;p=xfstests-dev.git

xfstests: fix internal _xfs_check to handle logdev etc

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>
Reviewed-by: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
---

diff --git a/common/rc b/common/rc
index 846d47da..bf1c8b71 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()