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 705643da597e453baeef7750c24cb3513292b710..2f5179522b8122dc64f393fd4417f26b29338efd 100755 (executable)
--- 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'
 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 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"
 _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 f809b499e8ccadfa47492b710bbff03b3368e8b0..569a25f16c83eb6ec04ba66631bb052b68afdc34 100755 (executable)
--- 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'
 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 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"
 _set_sb_data fdblocks $((sb_fdblocks - debris_len))
 
 echo "Add the extent to the refcount btree"