btrfs: add minimal file system size check

Some btrfs tests call _scratch_pool_mkfs or _scratch_mkfs by themselves to
specify file system size limit. It slips through the check in
_scratch_mkfs_sized(). Let's add size check call for each of them.

Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/btrfs/141 b/tests/btrfs/141
index 6f9a177a448702f050afbbdbf41201c901094381..cf0979e9b42add08d02f07dc91d6369adbab8aeb 100755 (executable)
--- a/tests/btrfs/141
+++ b/tests/btrfs/141
@@ -55,6 +55,7 @@ _scratch_dev_pool_get 2
 # step 1, create a raid1 btrfs which contains one 128k file.
 echo "step 1......mkfs.btrfs" >>$seqres.full
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 mkfs_opts="-d raid1 -b 1G"
 _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 

diff --git a/tests/btrfs/142 b/tests/btrfs/142
index 3caa37d167abca0457f650747895fc8622c5920d..1318be0fba186e0fa8a84a9bd003718438301523 100755 (executable)
--- a/tests/btrfs/142
+++ b/tests/btrfs/142
@@ -33,6 +33,7 @@ _scratch_dev_pool_get 2
 # step 1, create a raid1 btrfs which contains one 128k file.
 echo "step 1......mkfs.btrfs" >>$seqres.full
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 mkfs_opts="-d raid1 -b 1G"
 _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 

diff --git a/tests/btrfs/143 b/tests/btrfs/143
index f062f77bd7ce07efee1b72aee4b84045d55c9a83..6736dcad1702c14962ab333b77a19a0bb990b170 100755 (executable)
--- a/tests/btrfs/143
+++ b/tests/btrfs/143
@@ -40,6 +40,7 @@ _scratch_dev_pool_get 2
 # step 1, create a raid1 btrfs which contains one 128k file.
 echo "step 1......mkfs.btrfs" >>$seqres.full
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 mkfs_opts="-d raid1 -b 1G"
 _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 

diff --git a/tests/btrfs/150 b/tests/btrfs/150
index 56938b0f45004e1883c1d2e6469b7c8c8555ce01..986c80697f15e104da7870be0fc10cbfe6dc1b6b 100755 (executable)
--- a/tests/btrfs/150
+++ b/tests/btrfs/150
@@ -43,6 +43,7 @@ disable_io_failure()
        echo 0 > $SYSFS_BDEV/make-it-fail
 }
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 _scratch_pool_mkfs "-d raid1 -b 1G" >> $seqres.full 2>&1
 
 # It doesn't matter which compression algorithm we use.

diff --git a/tests/btrfs/151 b/tests/btrfs/151
index 3150fef07e191c8841ebe37d263e5f19e1a51fa4..099e85cc7b2e94a8f1cb09f2f78e657273858159 100755 (executable)
--- a/tests/btrfs/151
+++ b/tests/btrfs/151
@@ -23,6 +23,7 @@ _supported_fs btrfs
 _require_scratch
 _require_scratch_dev_pool 3
 _require_btrfs_dev_del_by_devid
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 
 # We need exactly 3 disks to form a fixed stripe layout for this test.
 _scratch_dev_pool_get 3

diff --git a/tests/btrfs/156 b/tests/btrfs/156
index 364135ab3e657281d8f125f231bc0dbf80de2c33..11bf4638c7d1f86b5ccab6f69b2244b41ac24e43 100755 (executable)
--- a/tests/btrfs/156
+++ b/tests/btrfs/156
@@ -37,6 +37,7 @@ nr_files=$(( $fs_size / $file_size / 2))
 # Force to use single data and meta profile.
 # Since the test relies on fstrim output, which will differ for different
 # profiles
+_check_minimal_fs_size $fs_size
 _scratch_mkfs -b $fs_size -m single -d single > /dev/null
 _scratch_mount
 

diff --git a/tests/btrfs/157 b/tests/btrfs/157
index c08cebdc9c222b5eb208961ff2fce47c7abddcae..0cfe3ce565483a26ef522a26c2bdde441ba18161 100755 (executable)
--- a/tests/btrfs/157
+++ b/tests/btrfs/157
@@ -60,6 +60,7 @@ _scratch_dev_pool_get 4
 # step 1: create a raid6 btrfs and create a 128K file
 echo "step 1......mkfs.btrfs" >>$seqres.full
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 mkfs_opts="-d raid6 -b 1G"
 _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 

diff --git a/tests/btrfs/158 b/tests/btrfs/158
index 4a642f52c05e794699bcb91a26d792d9a37a3353..ad374eba8c7e534a2bb7e51dc8f1b8dfa869f2ef 100755 (executable)
--- a/tests/btrfs/158
+++ b/tests/btrfs/158
@@ -52,6 +52,7 @@ _scratch_dev_pool_get 4
 # step 1: create a raid6 btrfs and create a 128K file
 echo "step 1......mkfs.btrfs" >>$seqres.full
 
+_check_minimal_fs_size $(( 1024 * 1024 * 1024 ))
 mkfs_opts="-d raid6 -b 1G"
 _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 

diff --git a/tests/btrfs/175 b/tests/btrfs/175
index 8a9c0721f5edc5a8b3c3bfc73d3fa7d3ac6c1baf..bf0ede257f87e386675ba2490560f5b8b2f746ae 100755 (executable)
--- a/tests/btrfs/175
+++ b/tests/btrfs/175
@@ -14,6 +14,7 @@ _begin_fstest auto quick swap volume
 _supported_fs btrfs
 _require_scratch_dev_pool 2
 _require_scratch_swapfile
+_check_minimal_fs_size $((1024 * 1024 * 1024))
 
 cycle_swapfile() {
        local sz=${1:-$(($(get_page_size) * 10))}