generic/25[02]: Increase fs size to 196 mb

Those 2 tests fail on btrfs on a ppc64 system with 64k pages. This is
caused by the improved minimum device size calculation in upstream
btrfs-progs (commit: 31d228a2eb98 ("btrfs-progs: mkfs: Enhance minimal
device size calculation to fix mkfs failure on small file")).i

Xfstests implicitly uses '--mixed' options for filesystems smaller than
256mb thus the minimum filesystem size require is derived from the
following equation: 2 * (4mb + nodesize << 10). On a 64k page system
this evaluates to 2 * (4m + 64m) = 136m. This resuts in failures such:
mkfs.btrfs  -b $((100 * 1048576)) btrfs-test.img

    ERROR: size 104857600 is too small to make a usable filesystem
    ERROR: minimum size for btrfs filesystem is 114294784

when running _scratch_mkfs_sized $((100 * 1048576)).

Fix this by increasing the minimum filesystem size to 196 megabytes
which makes mkfs.btrfs happy again and allows the test to proceed.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/250 b/tests/generic/250
index 74854c155799aabbfd9696c14a6836f9eb8a39b0..8ec65d4ca39e7dc8c8d537dfdb6a1dd75f1b8f5c 100755 (executable)
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -40,7 +40,7 @@ _require_no_rtinherit
 
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 

-fssize=$((100 * 1048576))
+fssize=$((196 * 1048576))

 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
 _scratch_mkfs_sized $fssize > $seqres.full 2>&1
 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
 _scratch_mkfs_sized $fssize > $seqres.full 2>&1

diff --git a/tests/generic/252 b/tests/generic/252
index 991bbe3e06452936b87166a5b49dd38ae6f6e575..2e86c81936af54ad2c97f121aabe858c8c1555f4 100755 (executable)
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -42,7 +42,7 @@ AIO_TEST="src/aio-dio-regress/aiocp"
 rm -f $seqres.full
 
 
 rm -f $seqres.full
 
 

-fssize=$((100 * 1048576))
+fssize=$((196 * 1048576))

 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
 _scratch_mkfs_sized $fssize > $seqres.full 2>&1
 echo "Format and mount"
 $XFS_IO_PROG -d -c "pwrite -S 0x69 -b 1048576 0 $fssize" $SCRATCH_DEV >> $seqres.full
 _scratch_mkfs_sized $fssize > $seqres.full 2>&1