xfs/{050,144,153,299,330}: update quota reports to handle metadir trees

Prior to the new metadir feature in XFS, the rtbitmap and rtsummary
files were included in icount, though their bcount contribution is zero
due to rt and quota not being supported together.  With the new metadir
feature in XFS, no files in the metadata directory tree are counted in
quota.

Hence we must adjust the icount of any quota report down by two to avoid
breaking golden outputs.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/filter b/common/filter
index 7e02ded377cc9b863d7a52eaed76c6ca8cfe7162..1ebfd27e898e01208be9b1630ae1a5baa3196594 100644 (file)
--- a/common/filter
+++ b/common/filter
@@ -624,11 +624,14 @@ _filter_getcap()
 
 # Filter user/group/project id numbers out of quota reports, and standardize
 # the block counts to use filesystem block size.  Callers must set the id and
-# bsize variables before calling this function.
+# bsize variables before calling this function.  The HIDDEN_QUOTA_FILES variable
+# (by default zero) is the number of root files to filter out of the inode
+# count part of the quota report.
 _filter_quota_report()
 {
        test -n "$id" || echo "id must be set"
        test -n "$bsize" || echo "block size must be set"
+       test -n "$HIDDEN_QUOTA_FILES" || HIDDEN_QUOTA_FILES=0
 
        tr -s '[:space:]' | \
        perl -npe '
@@ -636,7 +639,7 @@ _filter_quota_report()
                s/^\#0 \d+ /[ROOT] 0 /g;
                s/6 days/7 days/g' |
        perl -npe '
-               $val = 0;
+               $val = '"$HIDDEN_QUOTA_FILES"';
                if ($ENV{'LARGE_SCRATCH_DEV'}) {
                        $val = $ENV{'NUM_SPACE_FILES'};
                }

diff --git a/common/xfs b/common/xfs
index 85cd9a1348e385921ca9eae0611e59b1a888844f..eb4d99c91a8019b341547c49ffd43429baf74b23 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -1927,3 +1927,32 @@ _scratch_xfs_force_no_metadir()
                MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS"
        fi
 }
+
+# Decide if a mount filesystem has metadata directory trees.
+_xfs_mount_has_metadir() {
+       local mount="$1"
+
+       # spaceman (and its info command) predate metadir
+       test ! -e "$XFS_SPACEMAN_PROG" && return 1
+       $XFS_SPACEMAN_PROG -c "info" "$mount" | grep -q 'metadir=1'
+}
+
+# Compute the number of files that are not counted in quotas.
+_xfs_calc_hidden_quota_files() {
+       local mount="$1"
+
+       if _xfs_mount_has_metadir "$mount"; then
+               # Prior to the metadir feature, the realtime bitmap and summary
+               # file were "owned" by root and hence accounted to the root
+               # dquots.  The metadata directory feature stopped accounting
+               # metadata files to quotas, so we must subtract 2 inodes from
+               # the repquota golden outputs to keep the tests going.
+               #
+               # We needn't adjust the block counts because the kernel doesn't
+               # support rt quota and hence the rt metadata files will always
+               # be zero length.
+               echo -2
+       else
+               echo 0
+       fi
+}

diff --git a/tests/xfs/050 b/tests/xfs/050
index 78303bf784d05ecfe97d9fd854039bd395cfa9eb..1e40ab90a843e8a31ca50212a05e92603b99697b 100755 (executable)
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -30,9 +30,14 @@ _require_scratch
 _require_xfs_quota
 
 _scratch_mkfs >/dev/null 2>&1
+orig_mntopts="$MOUNT_OPTIONS"
+_qmount_option "uquota"
 _scratch_mount
 bsize=$(_get_file_block_size $SCRATCH_MNT)
+# needs quota enabled to compute the number of metadata dir files
+HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
 _scratch_unmount
+MOUNT_OPTIONS="$orig_mntopts"
 
 bsoft=$(( 200 * $bsize ))
 bhard=$(( 1000 * $bsize ))

diff --git a/tests/xfs/153 b/tests/xfs/153
index d5e43082c1cd3582eaa7f2f444340442ab7cef00..2ce22b8c44b298a99162599d46605606aaf75a10 100755 (executable)
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -35,9 +35,14 @@ _require_idmapped_mounts
 _require_test_program "vfs/mount-idmapped"
 
 _scratch_mkfs >/dev/null 2>&1
+orig_mntopts="$MOUNT_OPTIONS"
+_qmount_option "uquota"
 _scratch_mount
 bsize=$(_get_file_block_size $SCRATCH_MNT)
+# needs quota enabled to compute the number of metadata dir files
+HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
 _scratch_unmount
+MOUNT_OPTIONS="$orig_mntopts"
 
 bsoft=$(( 200 * $bsize ))
 bhard=$(( 1000 * $bsize ))

diff --git a/tests/xfs/299 b/tests/xfs/299
index 710eb89c2ac0e7ee3ab1fa43457a63d24b1af74e..3986f8fb904e5d321f1ef46dfab8c38f5b8d33b0 100755 (executable)
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -155,6 +155,7 @@ _qmount_option "uquota,gquota,pquota"
 _qmount
 
 bsize=$(_get_file_block_size $SCRATCH_MNT)
+HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
 
 bsoft=$(( 100 * $bsize ))
 bhard=$(( 500 * $bsize ))

diff --git a/tests/xfs/330 b/tests/xfs/330
index d239a64085c76cdc6c37105b010cd02195d523f9..30c09ff5906e12ac7d75b7751d7a752565bfcd71 100755 (executable)
--- a/tests/xfs/330
+++ b/tests/xfs/330
@@ -24,7 +24,10 @@ _require_nobody
 
 do_repquota()
 {
-       repquota $SCRATCH_MNT | grep -E '^(fsgqa|root|nobody)' | sort -r
+       repquota $SCRATCH_MNT | grep -E '^(fsgqa|root|nobody)' | sort -r | \
+       perl -npe '
+               $val = '"$HIDDEN_QUOTA_FILES"';
+               s/(^root\s+--\s+\S+\s+\S+\s+\S+\s+)(\S+)/$1@{[$2 - $val]}/g'
 }
 
 rm -f "$seqres.full"
@@ -33,6 +36,7 @@ echo "Format and mount"
 _scratch_mkfs > "$seqres.full" 2>&1
 export MOUNT_OPTIONS="-o usrquota,grpquota $MOUNT_OPTIONS"
 _scratch_mount >> "$seqres.full" 2>&1
+HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null