xfs/139: work with 1k block size
PATCH 1/2 xfs/139: work with 1k block size
Commit 0e2b99951fa11ea8a8adf4676aef130cfeeb5250 (xfs/139: work with 64k block size) created a test filesystem with AG size set to (8192 * block size). When working with a 1k block sized XFS filesystem, this tries to set the AG size to 8MiB which is less than the minimum AG size of 16MiB. Hence creation of the filesystem had actually failed.
This commit fixes the issue by setting AG size to be (16384 * block size).
--- tests/xfs/139 | 4 ++-- tests/xfs/139.out | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tests/xfs/139 +2 -2
@@ -40,14 +40,14 @@ blksz=$(_get_file_block_size $SCRATCH_MNT) _scratch_unmount echo "Format and mount" -_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1 +_scratch_mkfs -d agsize=$((16384 * $blksz)) > $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1 testdir=$SCRATCH_MNT/test-$seq mkdir $testdir echo "Create the original files" -sz=$((12288 * $blksz)) +sz=$((20480 * $blksz)) _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full _scratch_cycle_mount
tests/xfs/139.out +2 -2
@@ -5,7 +5,7 @@ CoW every other block Compare files 0 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 62 * -30000 +50000 0 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 61 * -30000 +50000
Signature · 1 line
2.9.5
PATCH 2/2 xfs/140: work with 1k block size
Commit 7a7641063ac3a7ae051c9e1959f4d7b1a25bb91c (xfs/140: work with 64k block size) created a test filesystem with AG size set to (8192 * block size). When working with a 1k block sized XFS filesystem, this tries to set the AG size to 8MiB which is less than the minimum AG size of 16MiB. Hence creation of the filesystem had actually failed.
This commit fixes the issue by resetting AG size to 16MiB if (8192 * block size) results in a value less than 16MiB. Later the test file size and the test file block count are then appropriately calculated.
--- tests/xfs/140 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
tests/xfs/140 +8 -3
@@ -39,16 +39,21 @@ _scratch_mount blksz=$(_get_file_block_size $SCRATCH_MNT) _scratch_unmount +agsize=$((8192 * $blksz)) +if [[ $agsize -lt $((16 * 1024 * 1024)) ]]; then + agsize=$((16 * 1024 * 1024)) +fi +sz=$((4096 * $blksz + $agsize)) +nr=$(($sz / $blksz)) + echo "Format and mount" -_scratch_mkfs -d agsize=$((8192 * $blksz)) > $seqres.full 2>&1 +_scratch_mkfs -d agsize=$agsize > $seqres.full 2>&1 _scratch_mount >> $seqres.full 2>&1 testdir=$SCRATCH_MNT/test-$seq mkdir $testdir echo "Create the original files" -nr=12288 -sz=$(($nr * $blksz)) _pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full _pwrite_byte 0x61 0 $sz $testdir/file2.chk >> $seqres.full
Signature · 1 line
2.9.5