xfstests: refactor xfsdump quota checking

Tests can enable/disable quota checking by passing -q or -Q to the
various dump and restore helper routines. But -q and -Q are valid
xfsdump/xfsrestore options, so in addition to being confusing, tests
cannot use these options. Use --check-quota and --no-check-quota
instead.

Signed-off-by: Bill Kendall <wkendall@sgi.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/061 b/061
index 414675fa3b29e5da8b4d865c6805a01b08c9986c..2b08e11c2dd09508c969306a503ac3b9c1146954 100755 (executable)
--- a/061
+++ b/061
@@ -48,7 +48,8 @@ dump_file=src/dumpfile # override dump_file to checked-in dumpfile
 session_label="stress_056"
 # we have no quotas to restore
 # if we happen to run this on crackle then put the hostname back
-_do_restore_file -Q  | sed -e 's/HOSTNAME/crackle/g' -e 's#SCRATCH_DEV#/dev/dsk/dks0d2s1#'
+_do_restore_file --no-check-quota |
+sed -e 's/HOSTNAME/crackle/g' -e 's#SCRATCH_DEV#/dev/dsk/dks0d2s1#'
 _diff_compare_sub
 _ls_nodate_compare_sub
 

diff --git a/common.dump b/common.dump
index 56b348aaa1f91185e4ca511671d15992f033be3a..09f1a918965a38201c49457204a55ebd284c304a 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -903,10 +903,10 @@ _parse_args()
            multi=$2
            shift
            ;;
-        -q)
+        --check-quota)
             do_quota_check=true
             ;;
-        -Q)
+        --no-check-quota)
             do_quota_check=false
             ;;
         -l|-d)