From: Christoph Hellwig <hch@lst.de>
Date: Tue, 28 Feb 2017 00:52:35 +0000 (-0800)
Subject: xfs/004: relax freespace check
X-Git-Tag: v2022.05.01~2150
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5fa3e61cc220e2673b2998d2d11ef16884889979;p=xfstests-dev.git

xfs/004: relax freespace check

Just check for a greater equals relation so that we don't have
to adjust the test for every new reservation scheme we add..

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/xfs/004 b/tests/xfs/004
index bbc1aee3..f27f4b79 100755
--- a/tests/xfs/004
+++ b/tests/xfs/004
@@ -83,18 +83,15 @@ eval `$XFS_IO_PROG -x -c resblks $SCRATCH_MNT 2>&1 \
 echo "resblks gave: resblks=$resblks" >>$seqres.full
 
 # check the 'blocks' field from freesp command is OK
-#  - starting with Linux 4.10-rc the bmbt split reservation moved to be per-AG
 perl -ne '
 	BEGIN	{ $avail ='$avail' * 512 + ('$resblks' * '$dbsize');
 		  $answer="(no xfs_db free blocks line?)" }
 	/free blocks (\d+)$/	|| next;
 	$freesp = $1 * '$dbsize';
-	if ($freesp == $avail + ('$agcount') * '$dbsize' * 8) {
-		$answer = "yes";
-	} elsif ($freesp == $avail + (('$agcount' + 1) * '$dbsize' * 4)) {
+	if ($freesp >= $avail) {
 		$answer = "yes";
 	} else {
-		$answer = "no ($freesp != $avail)";
+		$answer = "no ($freesp < $avail)";
 	}
 	END	{ print "$answer\n" }
 	' <$tmp.xfs_db >$tmp.ans