From: Dave Chinner <dgc@sgi.com>
Date: Thu, 28 Jun 2007 15:57:56 +0000 (+0000)
Subject: Make sure we take into account newly reserved blocks as introduced
X-Git-Tag: v1.1.0~483
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=373683715eb8d17cd9abc28107f778e776c214c2;p=xfstests-dev.git

Make sure we take into account newly reserved blocks as introduced
in 964468.
Merge of master-melb:xfs-cmds:29013a by kenmcd.
---

diff --git a/004 b/004
index bba61751..100ba802 100755
--- a/004
+++ b/004
@@ -67,21 +67,36 @@ xfs_db -r -c "freesp -s" $SCRATCH_DEV >$tmp.xfs_db
 echo "xfs_db for $SCRATCH_DEV" >>$seq.full
 cat $tmp.xfs_db >>$seq.full
 
+eval `$XFS_IO_PROG -x -c resblks $SCRATCH_MNT 2>&1 \
+	| $AWK_PROG '/available/ { printf "resblks=%u\n", $5 }'`
+echo "resblks gave: resblks=$resblks" >>$seq.full
+
 # check the 'blocks' field from freesp command is OK
 # since 2.6.18, df does not report the 4 blocks per AG that cannot
 # be allocated, hence we check for that exact mismatch.
+# since ~2.6.22, reserved blocks are used by default and df does
+# not report them, hence check for an exact mismatch.
 perl -ne '
-	    BEGIN	{ $avail ='$avail' * 512;
-			  $answer="(no xfs_db free blocks line?)" }
-	    /free blocks (\d+)$/	|| next;
-	    $freesp = $1 * '$dbsize';
-	    if ($freesp == $avail)	{ $answer = "yes"; }
-	    else {
+	BEGIN	{ $avail ='$avail' * 512;
+		  $answer="(no xfs_db free blocks line?)" }
+	/free blocks (\d+)$/	|| next;
+	$freesp = $1 * '$dbsize';
+	if ($freesp == $avail) {
+		$answer = "yes";
+	} else {
 		$avail = $avail + (('$agcount' + 1) * '$dbsize' * 4);
-		if ($freesp == $avail)	{ $answer = "yes"; }
-		else			{ $answer = "no ($freesp != $avail)"; }
-	    }
-	    END	{ print "$answer\n" }
+		if ($freesp == $avail) {
+			$answer = "yes";
+		} else {
+			$avail = $avail + ('$resblks' * '$dbsize');
+			if ($freesp == $avail) {
+				$answer = "yes";
+			} else {
+				$answer = "no ($freesp != $avail)";
+			}
+		}
+	}
+	END	{ print "$answer\n" }
 	' <$tmp.xfs_db >$tmp.ans
 ans="`cat $tmp.ans`"
 echo "Checking blocks column same as df: $ans"