xfs/007: fix regressions on V4 filesystems

[xfstests-dev.git] / tests / xfs / 007

diff --git a/tests/xfs/007 b/tests/xfs/007
index 01cc4210109744e648cfa73482401e3b78a96018..4f864100fde32da2e72985830faf146a96fcdac1 100755 (executable)
--- a/tests/xfs/007
+++ b/tests/xfs/007
@@ -1,56 +1,26 @@
 #! /bin/bash
-# FS QA Test No. xfs/007
-#
-# Test to verify Q_XQUOTARM functionality.
-#
-#-----------------------------------------------------------------------
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2014 Red Hat, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# FS QA Test No. xfs/007
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
+# Test to verify Q_XQUOTARM functionality.
 #
+. ./common/preamble
+_begin_fstest auto quota quick
 
-seq=`basename $0`
-seqres=$RESULT_DIR/$seq
-echo "QA output created by $seq"
-
-here=`pwd`
-tmp=/tmp/$$
-status=1       # failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
-_cleanup()
-{
-    cd /
-    rm -f $tmp.*
-}
-
-# get standard environment, filters and checks
-. ./common/rc
+# Import common functions.
 . ./common/filter
 . ./common/quota
 
 # Modify as appropriate.
 _supported_fs xfs
-_supported_os Linux Irix
 
 _require_scratch
 _require_xfs_quota
 
-rm -f $seqres.full
-
-_scratch_mkfs_xfs >/dev/null 2>&1
+_scratch_mkfs_xfs | _filter_mkfs > /dev/null 2> $tmp.mkfs
+. $tmp.mkfs
 
 do_test()
 {
@@ -59,40 +29,62 @@ do_test()
        off_opts=$3
 
        echo "*** umount"
-       umount $SCRATCH_MNT
+       _scratch_unmount
 
-       QINO_1=`xfs_db -c "sb 0" -c "p" $SCRATCH_DEV | \
-                       grep $qino_1 | awk '{print $NF}'`
-       QINO_2=`xfs_db -c "sb 0" -c "p" $SCRATCH_DEV | \
-                       grep $qino_2 | awk '{print $NF}'`
+       QINO_1=`_scratch_xfs_get_sb_field $qino_1`
+       QINO_2=`_scratch_xfs_get_sb_field $qino_2`
 
        echo "*** Usage before quotarm ***"
-       xfs_db -c "inode $QINO_1" -c "p core.nblocks" $SCRATCH_DEV
-       xfs_db -c "inode $QINO_2" -c "p core.nblocks" $SCRATCH_DEV
+       _scratch_xfs_db -c "inode $QINO_1" -c "p core.nblocks"
+       _scratch_xfs_db -c "inode $QINO_2" -c "p core.nblocks"
 
        _qmount
        echo "*** turn off $off_opts quotas"
-       xfs_quota -x -c "off -$off_opts" $SCRATCH_MNT
-       xfs_quota -x -c "remove -$off_opts" $SCRATCH_MNT
+       $XFS_QUOTA_PROG -x -c "off -$off_opts" $SCRATCH_MNT
+
+       # Remount the filesystem with no quota options to force quotas off.
+       # This takes care of newer kernels where quotaoff clears the superblock
+       # quota enforcement flags but doesn't shut down accounting.
+       _scratch_unmount
+       _qmount_option ""
+       _scratch_mount
+
+       rm_commands=(-x -c "remove -$off_opts")
+
+       # Remounting a V4 fs with no quota options means that the internal
+       # gquotino -> pquotino remapping does not happen.  If we want to
+       # truncate the "project" quota file we must run remove -g.  However,
+       # xfs_quota has a nasty sharp edge wherein passing '-g' and '-p' only
+       # results in a QUOTARM call for the group quota file, so we must make
+       # a separate remove call.
+       [ $_fs_has_crcs == 0 ] && [ "$off_opts" = "up" ] && \
+               rm_commands+=(-c "remove -g")
+
+       $XFS_QUOTA_PROG "${rm_commands[@]}" $SCRATCH_MNT
+
        echo "*** umount"
-       umount $SCRATCH_MNT
+       _scratch_unmount
 
        echo "*** Usage after quotarm ***"
-       xfs_db -c "inode $QINO_1" -c "p core.nblocks" $SCRATCH_DEV
-       xfs_db -c "inode $QINO_2" -c "p core.nblocks" $SCRATCH_DEV
+       _scratch_xfs_db -c "inode $QINO_1" -c "p core.nblocks"
+       _scratch_xfs_db -c "inode $QINO_2" -c "p core.nblocks"
 }
 
-
 # Test user and group first
 _qmount_option "uquota,gquota"
 _qmount
 do_test uquotino gquotino ug
 
-# Test user and project
+# Test user and project. Note that pquotino only exists on v5 (crc=1)
+# superblocks. Older supers reuse gquotino.
+PQUOTINO=pquotino
+if [ $_fs_has_crcs == 0 ]; then
+       PQUOTINO=gquotino
+fi
 _qmount_option "uquota,pquota"
 _qmount
 _require_prjquota $SCRATCH_DEV
-do_test uquotino pquotino up
+do_test uquotino $PQUOTINO up
 
 # success, all done
 status=0