From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 23 Apr 2020 23:31:36 +0000 (-0700)
Subject: xfs/30[78]: fix regressions due to strengthened AGF checks
X-Git-Tag: v2022.05.01~803
X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=6388518be930eb218115fa135f1068c4459fa3fa

xfs/30[78]: fix regressions due to strengthened AGF checks

Reorder the order in which we tweak AGF fields to avoid falling afoul of
the new AGF sanity checks.

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

diff --git a/tests/xfs/307 b/tests/xfs/307
index 705643da..2f517952 100755
--- a/tests/xfs/307
+++ b/tests/xfs/307
@@ -115,8 +115,8 @@ debris_bno=$((bno + len - debris_len))
 echo "Remove the extent from the freesp btrees"
 _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot'
 _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot'
-_set_agf_data freeblks $((agf_freeblks - debris_len))
 _set_agf_data longest $((len - debris_len))
+_set_agf_data freeblks $((agf_freeblks - debris_len))
 _set_sb_data fdblocks $((sb_fdblocks - debris_len))
 
 echo "Add the extent to the refcount btree"
diff --git a/tests/xfs/308 b/tests/xfs/308
index f809b499..569a25f1 100755
--- a/tests/xfs/308
+++ b/tests/xfs/308
@@ -115,8 +115,8 @@ debris_bno=$((bno + len - debris_len))
 echo "Remove the extent from the freesp btrees"
 _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot'
 _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot'
-_set_agf_data freeblks $((agf_freeblks - debris_len))
 _set_agf_data longest $((len - debris_len))
+_set_agf_data freeblks $((agf_freeblks - debris_len))
 _set_sb_data fdblocks $((sb_fdblocks - debris_len))
 
 echo "Add the extent to the refcount btree"