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

Commit Message

Darrick J. Wong April 23, 2020, 11:31 p.m. UTC

From: Darrick J. Wong <[e-mail]>

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 <[e-mail]>
---
 tests/xfs/307 |    2 +-
 tests/xfs/308 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Christoph Hellwig April 24, 2020, 10:30 a.m. UTC | #1

On Thu, Apr 23, 2020 at 04:31:36PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <[e-mail]>
> 
> 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 <[e-mail]>

Looks good,

Reviewed-by: Christoph Hellwig <[e-mail]>

Patch

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"