xfs: fix quota tests to adapt to realtime quota

Fix or limit the scope of tests so that we can turn on testing for
realtime quotas.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/common/quota b/common/quota
index 797253f6f4734fdb882a4172bcea716065172568..344c942045e5f2e0139c0adf1f2607fa68aa917f 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -454,5 +454,30 @@ _restore_project_quota()
        fi
 }
 
+# Reconfigure the mounted fs as needed so that we can test the VFS quota
+# utilities.  They do not support realtime block limits or reporting, so
+# we forcibly inhibit rtinherit on XFS filesystems.
+_force_vfs_quota_testing()
+{
+       local mount="${1:-$TEST_DIR}"
+
+       test "$FSTYP" = "xfs" && _xfs_force_bdev data "$mount"
+}
+
+# Does the mounted scratch filesystem have a realtime volume where quota works?
+# Returns nonzero if any of the above are false.
+_scratch_supports_rtquota()
+{
+       case "$FSTYP" in
+       "xfs")
+               if [ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ]; then
+                       _xfs_scratch_supports_rtquota
+                       return
+               fi
+       esac
+
+       return 1
+}
+
 # make sure this script returns success
 /bin/true

diff --git a/tests/generic/219 b/tests/generic/219
index d72aa745fdfcf14e0fcc0ddceb011bd06de80ef3..cc2ec119eb429899ec00f510c6e9b6716cb48376 100755 (executable)
--- a/tests/generic/219
+++ b/tests/generic/219
@@ -92,6 +92,7 @@ test_accounting()
 _scratch_unmount 2>/dev/null
 _scratch_mkfs >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
+_force_vfs_quota_testing $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2>/dev/null
 quotaon $SCRATCH_MNT 2>/dev/null
 _scratch_unmount

diff --git a/tests/generic/230 b/tests/generic/230
index ba95fbe725ad28aa6de8dc7cf5d06ae54b22ced0..799358416c7f66331acdd2a1b47ac5dac3de09d2 100755 (executable)
--- a/tests/generic/230
+++ b/tests/generic/230
@@ -100,6 +100,7 @@ _qmount_option 'defaults'
 
 _scratch_mkfs >> $seqres.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
+_force_vfs_quota_testing $SCRATCH_MNT
 BLOCK_SIZE=$(_get_file_block_size $SCRATCH_MNT)
 quotacheck -u -g $SCRATCH_MNT 2>/dev/null
 quotaon $SCRATCH_MNT 2>/dev/null

diff --git a/tests/generic/305 b/tests/generic/305
index 6ccbb3d07c70c24823800f35fc05b8c3689c5794..373abf57037ed66ce57c155a84a2de11ec5ac841 100755 (executable)
--- a/tests/generic/305
+++ b/tests/generic/305
@@ -26,6 +26,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
+_force_vfs_quota_testing $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/generic/326 b/tests/generic/326
index 321e7dc6a8e54c614bcfc1b6f652b2c48ca3bd46..d16e95aabaecd59d286731498b98102ba2412d1a 100755 (executable)
--- a/tests/generic/326
+++ b/tests/generic/326
@@ -27,6 +27,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
+_force_vfs_quota_testing $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/generic/327 b/tests/generic/327
index 2323e1e6a12ec83591f490deef72d2d55c8f318d..a90d8b5db876e78746af264439f5f7eb55a1136e 100755 (executable)
--- a/tests/generic/327
+++ b/tests/generic/327
@@ -25,6 +25,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
+_force_vfs_quota_testing $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/generic/328 b/tests/generic/328
index 25e1f2a021872f0aa6c7a5b93f6b933096762530..ae3bf01a9e1be598d5aa6c9a2477381b7c8617da 100755 (executable)
--- a/tests/generic/328
+++ b/tests/generic/328
@@ -26,6 +26,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
+_force_vfs_quota_testing $SCRATCH_MNT
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/generic/566 b/tests/generic/566
index a41e04852ed88c7229785af809e067b341d08069..a6ec82fd36d8bb3a63a104fd07c3fc652660c327 100755 (executable)
--- a/tests/generic/566
+++ b/tests/generic/566
@@ -35,7 +35,9 @@ _qmount
 dir="$SCRATCH_MNT/dummy"
 mkdir -p $dir
 chown $qa_user $dir
-$XFS_QUOTA_PROG -x -c "limit -g bsoft=100k bhard=100k $qa_user" $SCRATCH_MNT
+_scratch_supports_rtquota && \
+       extra_limits="rtbsoft=100k rtbhard=100k"
+$XFS_QUOTA_PROG -x -c "limit -g bsoft=100k bhard=100k $extra_limits $qa_user" $SCRATCH_MNT
 
 $XFS_IO_PROG -f -c 'pwrite -S 0x58 0 1m' $dir/foo >> $seqres.full
 chown $qa_user "${dir}/foo"

diff --git a/tests/generic/587 b/tests/generic/587
index 466596799431f784584c0f73f174548b84534932..49fcade72790d67dddc9c758d53b533f34f33bc0 100755 (executable)
--- a/tests/generic/587
+++ b/tests/generic/587
@@ -56,6 +56,7 @@ _scratch_mkfs > $seqres.full
 # This test must have user quota enabled
 _qmount_option usrquota
 _qmount >> $seqres.full
+_force_vfs_quota_testing $SCRATCH_MNT
 
 testfile=$SCRATCH_MNT/test-$seq
 touch $testfile

diff --git a/tests/generic/603 b/tests/generic/603
index 32dcaeb94152b177e1a21ba06f514b632fdea834..c5930e710e617ab9710798f924e3381cd2450cb8 100755 (executable)
--- a/tests/generic/603
+++ b/tests/generic/603
@@ -118,6 +118,7 @@ _scratch_mkfs >$seqres.full 2>&1
 _scratch_enable_pquota
 _qmount_option "usrquota,grpquota,prjquota"
 _qmount
+_force_vfs_quota_testing $SCRATCH_MNT
 _require_prjquota $SCRATCH_DEV
 BLOCK_SIZE=$(_get_file_block_size $SCRATCH_MNT)
 rm -rf $SCRATCH_MNT/t

diff --git a/tests/generic/691 b/tests/generic/691
index 25ce92bc486dcdf090aa9f7a9e59cee05fbdec06..305dfdb02a474b9b807f2bd80aea9c7dffa17d10 100755 (executable)
--- a/tests/generic/691
+++ b/tests/generic/691
@@ -37,6 +37,7 @@ _scratch_mkfs >$seqres.full 2>&1
 _scratch_enable_pquota
 _qmount_option "prjquota"
 _qmount
+_force_vfs_quota_testing $SCRATCH_MNT
 _require_prjquota $SCRATCH_DEV
 
 filter_quota()
@@ -64,6 +65,7 @@ exercise()
                _scratch_enable_pquota
        fi
        _qmount
+       _force_vfs_quota_testing $SCRATCH_MNT
        if [ "$type" = "P" ];then
                _create_project_quota $SCRATCH_MNT/t 100 $qa_user
                file=$SCRATCH_MNT/t/testfile

diff --git a/tests/generic/710 b/tests/generic/710
index 072cddf570f444039c2cd721c61797ceaebfc328..16f7276d3d4b04cd6c11a395c24b0d664b180dc1 100755 (executable)
--- a/tests/generic/710
+++ b/tests/generic/710
@@ -32,7 +32,9 @@ $XFS_IO_PROG -f -c 'pwrite -S 0x59 0 64k -b 64k' -c 'truncate 256k' $SCRATCH_MNT
 chown nobody $SCRATCH_MNT/b
 
 # Set up a quota limit
-$XFS_QUOTA_PROG -x -c "limit -u bhard=70k nobody" $SCRATCH_MNT
+_scratch_supports_rtquota && \
+       extra_limits="rtbhard=70k"
+$XFS_QUOTA_PROG -x -c "limit -u bhard=70k $extra_limits nobody" $SCRATCH_MNT
 
 echo before exchangerange >> $seqres.full
 $XFS_QUOTA_PROG -x -c 'report -a' $SCRATCH_MNT >> $seqres.full

diff --git a/tests/xfs/050 b/tests/xfs/050
index 4ce56d375e945bf9352eb261a265d2a9c73e1923..23a61e3fa68d5f3aae79081840a4d2471fd124d2 100755 (executable)
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -33,6 +33,7 @@ _scratch_mkfs >/dev/null 2>&1
 orig_mntopts="$MOUNT_OPTIONS"
 _qmount_option "uquota"
 _scratch_mount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 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)
@@ -75,6 +76,7 @@ _exercise()
        . $tmp.mkfs
 
        _qmount
+       _force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
        # Figure out whether we're doing large allocations
        # (bail out if they're so large they stuff the test up)

diff --git a/tests/xfs/096 b/tests/xfs/096
index f1f5d562d4fa18802ffda36cd3db5187e372244e..4c4fdfa12ef8405c4b4d6258d4ecea19843942a3 100755 (executable)
--- a/tests/xfs/096
+++ b/tests/xfs/096
@@ -20,6 +20,10 @@ _require_scratch
 _require_xfs_quota
 _require_xfs_nocrc
 
+if [ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ]; then
+       _notrun "Realtime quotas not supported on V4 filesystems"
+fi
+
 function option_string()
 {
        VAL=$1

diff --git a/tests/xfs/106 b/tests/xfs/106
index 10cbd1052bbc899bdeb99efebbd3c5c18206fede..108cd0b8c3061a37aa27b4657facb7644b420619 100755 (executable)
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -195,6 +195,7 @@ test_xfs_quota()
 {
        _qmount_option $1
        _qmount
+       _force_vfs_quota_testing $SCRATCH_MNT    # golden output encodes block usage
 
        if [ $type == "p" ]; then
                _require_prjquota $SCRATCH_DEV

diff --git a/tests/xfs/108 b/tests/xfs/108
index 149d76eeb17a42b28296d21842baaf7bb4588913..8adc63d4e56e4ff099fa93dff8ec21672cb44ef1 100755 (executable)
--- a/tests/xfs/108
+++ b/tests/xfs/108
@@ -63,6 +63,7 @@ test_accounting()
 export MOUNT_OPTIONS="-opquota"
 _scratch_mkfs_xfs >> $seqres.full
 _qmount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 _require_prjquota $SCRATCH_DEV
 
 rm -f $tmp.projects $seqres.full
@@ -70,6 +71,7 @@ _scratch_unmount 2>/dev/null
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
 cat $tmp.mkfs >>$seqres.full
 _scratch_mount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
 uid=1
 gid=2

diff --git a/tests/xfs/152 b/tests/xfs/152
index 94428b35d22a875552d0215c5c25d4f65582abfa..7ba00c4bfac9ff9415eb8d0c46d748e8cb49bf0a 100755 (executable)
--- a/tests/xfs/152
+++ b/tests/xfs/152
@@ -240,6 +240,7 @@ qmount_idmapped()
 {
        wipe_mounts
        _try_scratch_mount || _fail "qmount failed"
+       _force_vfs_quota_testing $SCRATCH_MNT    # golden output encodes block usage
 
        mkdir -p "${SCRATCH_MNT}/unmapped"
        mkdir -p "${SCRATCH_MNT}/idmapped"

diff --git a/tests/xfs/153 b/tests/xfs/153
index 2ce22b8c44b298a99162599d46605606aaf75a10..27db71e7738d08cd768fccdb01fd515916e8e774 100755 (executable)
--- a/tests/xfs/153
+++ b/tests/xfs/153
@@ -38,6 +38,7 @@ _scratch_mkfs >/dev/null 2>&1
 orig_mntopts="$MOUNT_OPTIONS"
 _qmount_option "uquota"
 _scratch_mount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 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)
@@ -80,6 +81,7 @@ run_tests()
        . $tmp.mkfs
 
        _qmount
+       _force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
        # Figure out whether we're doing large allocations
        # (bail out if they're so large they stuff the test up)

diff --git a/tests/xfs/161 b/tests/xfs/161
index 948121c0569484831eddfaf5bdcfefea07e5b3fd..5a951565e93e05e427bf7ca12d182dc6a8fa84f8 100755 (executable)
--- a/tests/xfs/161
+++ b/tests/xfs/161
@@ -36,6 +36,7 @@ _qmount_option "usrquota"
 _scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full
 _scratch_mount >> $seqres.full
 
+_xfs_force_bdev data $SCRATCH_MNT
 
 min_blksz=65536
 file_blksz=$(_get_file_block_size "$SCRATCH_MNT")

diff --git a/tests/xfs/213 b/tests/xfs/213
index 7b27e3c09a815a954c29565f4649a2c26883ecd5..a9e97ee01cabced4e8602e4d301131719ceec38f 100755 (executable)
--- a/tests/xfs/213
+++ b/tests/xfs/213
@@ -28,6 +28,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
+_force_vfs_quota_testing $SCRATCH_MNT  # repquota
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/xfs/214 b/tests/xfs/214
index f2f23b3fb33f5d0e7eca4849d63614f29b1392a0..c316a92baa4404e8a0fbc7e5945b7a9970882575 100755 (executable)
--- a/tests/xfs/214
+++ b/tests/xfs/214
@@ -29,6 +29,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
+_force_vfs_quota_testing $SCRATCH_MNT  # repquota
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null
 

diff --git a/tests/xfs/220 b/tests/xfs/220
index f89c976fb850afb8c72e87b4541fe5b866c96119..d34764301b9e0618688f64c6acafa52d70cdc074 100755 (executable)
--- a/tests/xfs/220
+++ b/tests/xfs/220
@@ -37,6 +37,7 @@ _scratch_mkfs_xfs >/dev/null 2>&1
 
 # mount  with quotas enabled
 _scratch_mount -o uquota
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
 # turn off quota
 $XFS_QUOTA_PROG -x -c off $SCRATCH_DEV
@@ -49,6 +50,7 @@ _scratch_mkfs_xfs >/dev/null 2>&1
 
 # mount  with quotas enabled
 _scratch_mount -o uquota
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
 # turn off quota accounting...
 $XFS_QUOTA_PROG -x -c off $SCRATCH_DEV

diff --git a/tests/xfs/299 b/tests/xfs/299
index 3986f8fb904e5d321f1ef46dfab8c38f5b8d33b0..9f8b6631ccabfb03151cbe9670daf97697ec654b 100755 (executable)
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -153,6 +153,7 @@ projid_file="$tmp.projid"
 echo "*** user, group, and project"
 _qmount_option "uquota,gquota,pquota"
 _qmount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 
 bsize=$(_get_file_block_size $SCRATCH_MNT)
 HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
@@ -180,6 +181,7 @@ cat $tmp.mkfs >>$seqres.full
 echo "*** uqnoenforce, gqnoenforce, and pqnoenforce"
 _qmount_option "uqnoenforce,gqnoenforce,pqnoenforce"
 _qmount
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 _exercise uno
 _exercise gno
 _exercise pno

diff --git a/tests/xfs/330 b/tests/xfs/330
index 30c09ff5906e12ac7d75b7751d7a752565bfcd71..ca74929b1d26fcb1464d8fc483e87f0404ae7b10 100755 (executable)
--- a/tests/xfs/330
+++ b/tests/xfs/330
@@ -36,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
+_force_vfs_quota_testing $SCRATCH_MNT   # golden output encodes block usage
 HIDDEN_QUOTA_FILES=$(_xfs_calc_hidden_quota_files $SCRATCH_MNT)
 quotacheck -u -g $SCRATCH_MNT 2> /dev/null
 quotaon $SCRATCH_MNT 2> /dev/null

diff --git a/tests/xfs/434 b/tests/xfs/434
index c5122884324eb002a5511494dd8acd6567fb2a4e..8c0f9e1691ac70d109018d517b54a7b5f96c199a 100755 (executable)
--- a/tests/xfs/434
+++ b/tests/xfs/434
@@ -44,6 +44,7 @@ _scratch_mount -o noquota >> "$seqres.full" 2>&1
 
 testdir="$SCRATCH_MNT/test-$seq"
 blksz=65536
+_require_congruent_file_oplen $SCRATCH_MNT $blksz
 blks=3
 mkdir "$testdir"
 

diff --git a/tests/xfs/435 b/tests/xfs/435
index 0bb5675e1dba23277fc5e127afb2c6d2ef00aabc..1debe5e92d1b806590d2fcbe58b36315c9c6a037 100755 (executable)
--- a/tests/xfs/435
+++ b/tests/xfs/435
@@ -35,6 +35,7 @@ _scratch_mount -o quota >> "$seqres.full" 2>&1
 
 testdir="$SCRATCH_MNT/test-$seq"
 blksz=65536
+_require_congruent_file_oplen $SCRATCH_MNT $blksz
 blks=3
 mkdir "$testdir"
 

diff --git a/tests/xfs/440 b/tests/xfs/440
index fc7319449d4da4bbadd116cc57406a9b1d97a3a3..5284d0283af05d34c3b33964791b5671d373157f 100755 (executable)
--- a/tests/xfs/440
+++ b/tests/xfs/440
@@ -28,6 +28,9 @@ echo "Format and mount"
 _scratch_mkfs > "$seqres.full" 2>&1
 _scratch_mount "-o usrquota,grpquota" >> "$seqres.full" 2>&1
 
+# Make sure all our files are on the data device
+_xfs_force_bdev data $SCRATCH_MNT
+
 echo "Create files"
 $XFS_IO_PROG -c "cowextsize 1m" $SCRATCH_MNT
 touch $SCRATCH_MNT/a $SCRATCH_MNT/force_fsgqa

diff --git a/tests/xfs/441 b/tests/xfs/441
index ca3c576ad9cc660687c6bc4a52c893430ba1c31a..a64da1d815047b54a3ae1858246ea9d96293e1e8 100755 (executable)
--- a/tests/xfs/441
+++ b/tests/xfs/441
@@ -31,6 +31,7 @@ check_quota() {
 echo "Format and mount (noquota)"
 _scratch_mkfs > "$seqres.full" 2>&1
 _scratch_mount "-o noquota" >> $seqres.full 2>&1
+_force_vfs_quota_testing $SCRATCH_MNT   # _check_quota_usage uses repquota
 
 echo "Create files"
 _pwrite_byte 0x58 0 1m $SCRATCH_MNT/a >> $seqres.full

diff --git a/tests/xfs/442 b/tests/xfs/442
index 77d08fda5958116612b19a90cc56ee6dd6206882..a9c37a878a9bd69d2718dbd4bd896e86ffffef0b 100755 (executable)
--- a/tests/xfs/442
+++ b/tests/xfs/442
@@ -69,6 +69,7 @@ _qmount_option "usrquota,grpquota,prjquota"
 # tests now have separate faster-running regression tests.
 _scratch_mkfs_sized $((1600 * 1048576)) > $seqres.full 2>&1
 _scratch_mount >> $seqres.full 2>&1
+_force_vfs_quota_testing $SCRATCH_MNT   # _check_quota_usage uses repquota
 
 nr_cpus=$((LOAD_FACTOR * 4))
 nr_ops=$((25000 * nr_cpus * TIME_FACTOR))

diff --git a/tests/xfs/508 b/tests/xfs/508
index ee1a0371db7d6dd4ca94676ce199ac659fc119f4..fb7e0ff9dc60cbb7ef7b4d77de8750ab64e780c6 100755 (executable)
--- a/tests/xfs/508
+++ b/tests/xfs/508
@@ -57,6 +57,8 @@ _require_prjquota $SCRATCH_DEV
 mkdir $SCRATCH_MNT/dir
 $QUOTA_CMD -x -c 'project -s test' $SCRATCH_MNT >>$seqres.full 2>&1
 $QUOTA_CMD -x -c 'limit -p bsoft=1m bhard=2m test' $SCRATCH_MNT
+_scratch_supports_rtquota && \
+       $QUOTA_CMD -x -c 'limit -p rtbsoft=1m rtbhard=2m test' $SCRATCH_MNT
 
 # test the Project inheritance bit is a directory only flag, and it's set on
 # directory by default. Expect no complain about "project inheritance flag is

diff --git a/tests/xfs/511 b/tests/xfs/511
index b55c34b923fa729f30c670d2110b2a7e1d7b76fd..7155f3f99561c13ca3d6649ef0bfeb5eb1ca53d9 100755 (executable)
--- a/tests/xfs/511
+++ b/tests/xfs/511
@@ -38,11 +38,19 @@ $XFS_IO_PROG -f -c "pwrite 0 65536" -c sync $SCRATCH_MNT/t/file >>$seqres.full
 quota_cmd="$XFS_QUOTA_PROG -x"
 $quota_cmd -c "project -s -p $SCRATCH_MNT/t 42" $SCRATCH_MNT >/dev/null 2>&1
 $quota_cmd -c 'limit -p isoft=53 bsoft=100m 42' $SCRATCH_MNT
+_scratch_supports_rtquota && \
+       $quota_cmd -c 'limit -p rtbsoft=100m 42' $SCRATCH_MNT
+
+# The golden output for this test was written with the assumption that the file
+# allocation unit divides 64k evenly, so the file block usage would be exactly
+# 64k.  On realtime filesystems this isn't always true (e.g. -rextsize=28k) so
+# we'll accept the space usage being the same as what du reports for the file.
+file_nblocks=$(du -B 1024 $SCRATCH_MNT/t/file | awk '{print $1}')
 
 # The itotal and size should be 53 and 102400(k), as above project quota limit.
 # The isued and used should be 2 and 64(k), as this case takes.
 df -k --output=file,itotal,iused,size,used $SCRATCH_MNT/t | \
-       _filter_scratch | _filter_spaces
+       _filter_scratch | _filter_spaces | sed -e "s|$file_nblocks$|64|"
 
 # success, all done
 status=0

diff --git a/tests/xfs/720 b/tests/xfs/720
index e4af2a8d5470d2eec42d9ba427c5df58eec58305..2f709627cd640f97e3fc9670dff2f0ff3325ba58 100755 (executable)
--- a/tests/xfs/720
+++ b/tests/xfs/720
@@ -30,6 +30,11 @@ _scratch_mkfs > "$seqres.full" 2>&1
 _qmount_option usrquota
 _qmount
 
+# This test tries to exceed quota limits by creating an N>2 block bmbt, setting
+# the block limit to 2N, and rebuilding the bmbt.  Hence we must force the
+# files to be created on the data device.
+_xfs_force_bdev data $SCRATCH_MNT
+
 blocksize=$(_get_block_size $SCRATCH_MNT)
 alloc_unit=$(_get_file_block_size $SCRATCH_MNT)