From de876b996aa2ddc16328d93cbb6535c589087179 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 22 Apr 2014 10:47:28 +1000 Subject: [PATCH] xfs: test X_QUOTARM functionality The Q_XQUOTARM quotactl was not working properly, because we weren't passing in proper flags. The xfs_fs_set_xstate() ioctl handler used the same flags for Q_XQUOTAON/OFF as well as Q_XQUOTARM, but Q_XQUOTAON/OFF look for XFS_UQUOTA_ACCT, XFS_UQUOTA_ENFD, XFS_GQUOTA_ACCT etc, i.e. quota type + state, while Q_XQUOTARM looks only for the type of quota, i.e. XFS_DQ_USER, XFS_DQ_GROUP etc. Unfortunately these flag spaces overlap a bit, so we got semi-random results for Q_XQUOTARM; i.e. the value for XFS_DQ_USER == XFS_UQUOTA_ACCT, etc. yeargh. Anyway, here's a simple test that demonstrates it, kernel patch to fix it will follow. Signed-off-by: Eric Sandeen Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/xfs/007 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/007.out | 10 ++++++ tests/xfs/group | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/xfs/007 create mode 100644 tests/xfs/007.out diff --git a/tests/xfs/007 b/tests/xfs/007 new file mode 100755 index 00000000..8cc5bf3e --- /dev/null +++ b/tests/xfs/007 @@ -0,0 +1,79 @@ +#! /bin/bash +# FS QA Test No. xfs/007 +# +# Test to verify Q_XQUOTARM functionality. +# +#----------------------------------------------------------------------- +# 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. +# +# 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 +#----------------------------------------------------------------------- +# + +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 +. ./common/filter +. ./common/quota + +# Modify as appropriate. +_supported_fs xfs +_supported_os Linux Irix + +_require_scratch +_require_xfs_quota + +_scratch_mkfs_xfs >/dev/null 2>&1 + +_qmount_option "uquota,gquota" +_qmount + +echo "*** umount" +umount $SCRATCH_MNT + +UQUOTINO=`xfs_db -c "sb 0" -c "p" $SCRATCH_DEV | grep uquotino | awk '{print $NF}'` +GQUOTINO=`xfs_db -c "sb 0" -c "p" $SCRATCH_DEV | grep gquotino | awk '{print $NF}'` + +echo "*** Usage before quotarm ***" +xfs_db -c "inode $UQUOTINO" -c "p core.nblocks" $SCRATCH_DEV +xfs_db -c "inode $GQUOTINO" -c "p core.nblocks" $SCRATCH_DEV + +_qmount +echo "*** turn off user and group quotas" +xfs_quota -x -c 'off -ug' $SCRATCH_MNT +xfs_quota -x -c "remove -ug" $SCRATCH_MNT +echo "*** umount" +umount $SCRATCH_MNT + +echo "*** Usage after quotarm ***" +xfs_db -c "inode $UQUOTINO" -c "p core.nblocks" $SCRATCH_DEV +xfs_db -c "inode $GQUOTINO" -c "p core.nblocks" $SCRATCH_DEV + +# success, all done +status=0 +exit diff --git a/tests/xfs/007.out b/tests/xfs/007.out new file mode 100644 index 00000000..0fc17aeb --- /dev/null +++ b/tests/xfs/007.out @@ -0,0 +1,10 @@ +QA output created by 007 +*** umount +*** Usage before quotarm *** +core.nblocks = 1 +core.nblocks = 1 +*** turn off user and group quotas +*** umount +*** Usage after quotarm *** +core.nblocks = 0 +core.nblocks = 0 diff --git a/tests/xfs/group b/tests/xfs/group index e9c48083..445783e1 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -4,6 +4,7 @@ 004 db auto quick 005 auto quick 006 auto dir +007 auto quota quick 008 rw ioctl auto quick 009 rw ioctl auto prealloc quick 012 rw auto quick -- 2.39.5