With the log size now going past 128MB, test 206 creates a filesystem
with a much larger log than 128MB. The golden output expects at
128MB log size, so the test breaks. Filter the log size out of the
mkfs output and golden output so that the test works on both older and
newer mkfs binaries.
Signed-off-by: Dave Chinner <david@xxxxxxxxxxxxx>
---
206 | 9 ++++++---
206.out | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/206 b/206
index b1b2286..0935335 100755
--- a/206
+++ b/206
@@ -75,19 +75,22 @@ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864
count=1 >/dev/null 2>&1 \
# mkfs slightly smaller than that
echo "=== mkfs.xfs ==="
mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0
$tmpfile \
- | sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g"
+ | sed -e "s,^meta-data=.*isize,meta-data=FILE
isize,g" \
+ -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
# see what happens when we growfs it
echo "=== xfs_growfs ==="
xfs_growfs $tmpdir \
- | sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g"
+ | sed -e "s,^meta-data=.*isize,meta-data=FILE
isize,g" \
+ -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
# and double-check the new geometry
echo "=== xfs_info ==="
xfs_info $tmpdir \
- | sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g"
+ | sed -e "s,^meta-data=.*isize,meta-data=FILE
isize,g" \
+ -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
# _cleanup cleans up for us
diff --git a/206.out b/206.out
index 57d4f4e..da70d01 100644
--- a/206.out
+++ b/206.out
@@ -6,7 +6,7 @@ meta-data=FILE isize=256 agcount=52,
agsize=76288719 blks
data = bsize=4096 blocks=3905982455, imaxpct=5
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0
-log =internal log bsize=4096 blocks=32768, version=2
+log =internal log bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0
realtime =none extsz=4096 blocks=0, rtextents=0
=== xfs_growfs ===
@@ -15,7 +15,7 @@ meta-data=FILE isize=256 agcount=52,
agsize=76288719 blks
data = bsize=4096 blocks=3905982455, imaxpct=5
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0
-log =internal bsize=4096 blocks=32768, version=2
+log =internal bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0
realtime =none extsz=4096 blocks=0, rtextents=0
data blocks changed from 3905982455 to 4882478016
@@ -25,6 +25,6 @@ meta-data=FILE isize=256 agcount=64,
agsize=76288719 blks
data = bsize=4096 blocks=4882478016, imaxpct=5
= sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0
-log =internal bsize=4096 blocks=32768, version=2
+log =internal bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0
realtime =none extsz=4096 blocks=0, rtextents=0
--
1.6.5
|