From: Rich Johnston <rjohnston@sgi.com>
Date: Tue, 6 Nov 2012 20:23:59 +0000 (-0600)
Subject: Revert "xfstests: optionally run all tests under quota"
X-Git-Tag: v2022.05.01~3569
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=103af3fcab15f165f8d6ee45a8732f29e62bbfc5;p=users%2Fhch%2Fxfstests-dev.git

Revert "xfstests: optionally run all tests under quota"

Signed-off-by: Rich Johnston <rjohnston@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

This reverts commit edd6bcf9c478036df9056df05924f791a0d322dd which caused
the following tests to fail:

142.out.bad:Can't initialize the DMAPI
143.out.bad:Can't initialize the DMAPI
144.out.bad:Can't initialize the DMAPI
145.out.bad:Can't initialize the DMAPI
146.out.bad:Can't initialize the DMAPI
147.out.bad:Can't initialize the DMAPI
150.out.bad:Can't initialize the DMAPI
155.out.bad:Can't initialize the DMAPI
156.out.bad:Can't initialize the DMAPI
157.out.bad:Can't initialize the DMAPI
158.out.bad:Can't initialize the DMAPI
161.out.bad:Can't initialize the DMAPI
168.out.bad:Can't initialize the DMAPI
175.out.bad:Can't initialize the DMAPI
176.out.bad:Can't initialize the DMAPI
185.out.bad:Can't initialize the DMAPI
---

diff --git a/common.rc b/common.rc
index bfc639283..f7c16887c 100644
--- a/common.rc
+++ b/common.rc
@@ -100,9 +100,6 @@ _mount_opts()
     *)
 	;;
     esac
-    if [ ! -z "$USE_QUOTA" ]; then
-	export MOUNT_OPTIONS="$MOUNT_OPTIONS -o usrquota,grpquota"
-    fi
 }
 
 _mkfs_opts()
@@ -203,10 +200,6 @@ _test_options()
     type=$1
     TEST_OPTIONS=""
 
-    if [ ! -z "$USE_QUOTA" ]; then
-	TEST_OPTIONS="-o usrquota,grpquota"
-    fi
-
     if [ "$FSTYP" != "xfs" ]; then
         return
     fi
@@ -248,25 +241,6 @@ _mount_ops_filter()
 
 }
 
-_setup_quota()
-{
-    mountpoint=$1
-    if [ ! -z "$USE_QUOTA" ]; then
-	case $FSTYP in
-	xfs)
-	    ;;
-	ext*|reiserfs)
-	    quotaoff $mountpoint &>/dev/null
-	    quotacheck -u -g $mountpoint
-	    quotaon $mountpoint
-	    ;;
-	*)
-	    _fail "Don't know how to turn on quota on $FSTYP"
-	    ;;
-	esac
-    fi
-}
-
 _scratch_mount_options()
 {
     _scratch_options mount
@@ -277,7 +251,6 @@ _scratch_mount_options()
 _scratch_mount()
 {
     _mount -t $FSTYP `_scratch_mount_options $*`
-    _setup_quota $SCRATCH_MNT
 }
 
 _scratch_unmount()
@@ -295,7 +268,6 @@ _test_mount()
 {
     _test_options mount
     _mount -t $FSTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
-    _setup_quota $TEST_DIR
 }
 
 _scratch_mkfs_options()