misc: fix _get_file_block_size usage
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 11 Nov 2020 00:43:39 +0000 (16:43 -0800)
committerEryu Guan <guaneryu@gmail.com>
Sun, 22 Nov 2020 14:17:50 +0000 (22:17 +0800)
Fix these tests that rely on the allocation unit size of a file, which
might not necessarily be the fs block size.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/generic/157
tests/generic/175
tests/xfs/129
tests/xfs/169
tests/xfs/208
tests/xfs/336
tests/xfs/344
tests/xfs/345

index 5ec8999..379c38b 100755 (executable)
@@ -46,7 +46,7 @@ testdir2=$SCRATCH_MNT/test-$seq
 mkdir $testdir2
 
 echo "Create the original files"
-blksz="$(_get_block_size $testdir1)"
+blksz="$(_get_file_block_size $testdir1)"
 blks=1000
 margin='7%'
 sz=$((blksz * blks))
index f1b7352..436d2cc 100755 (executable)
@@ -41,7 +41,7 @@ testdir="$SCRATCH_MNT/test-$seq"
 mkdir "$testdir"
 
 echo "Create a one block file"
-blksz="$(_get_block_size $testdir)"
+blksz="$(_get_file_block_size $testdir)"
 _pwrite_byte 0x61 0 $blksz "$testdir/file1" >> "$seqres.full"
 
 fnr=19
index 5e34880..78baf5c 100755 (executable)
@@ -44,7 +44,7 @@ mkdir $testdir
 metadump_file=$TEST_DIR/${seq}_metadump
 
 echo "Create the original file blocks"
-blksz="$(_get_block_size $testdir)"
+blksz="$(_get_file_block_size $testdir)"
 nr_blks=$((4 * blksz / 12))
 _pwrite_byte 0x61 0 $((blksz * nr_blks)) $testdir/file1 >> $seqres.full
 
index 44577fb..2051091 100755 (executable)
@@ -42,7 +42,7 @@ testdir=$SCRATCH_MNT/test-$seq
 mkdir $testdir
 
 echo "Create the original file blocks"
-blksz="$(_get_block_size $testdir)"
+blksz="$(_get_file_block_size $testdir)"
 nr_blks=$((8 * blksz / 12))
 
 for i in 1 2 x; do
index 104763d..2a899fc 100755 (executable)
@@ -56,7 +56,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
-real_blksz=$(_get_block_size $testdir)
+real_blksz=$(_get_file_block_size $testdir)
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
index 5f32f06..a006938 100755 (executable)
@@ -39,7 +39,7 @@ _scratch_mkfs | _filter_mkfs 2>$tmp.mkfs >/dev/null
 . $tmp.mkfs
 cat $tmp.mkfs > "$seqres.full" 2>&1
 _scratch_mount
-blksz="$(_get_block_size $SCRATCH_MNT)"
+blksz="$(_get_file_block_size $SCRATCH_MNT)"
 
 metadump_file=$TEST_DIR/${seq}_metadump
 rm -rf $metadump_file
index b00541f..46868fa 100755 (executable)
@@ -55,7 +55,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
-real_blksz=$(_get_block_size $testdir)
+real_blksz=$(_get_file_block_size $testdir)
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"
index ceb1dce..4204cc2 100755 (executable)
@@ -53,7 +53,7 @@ bufnr=16
 bufsize=$((blksz * bufnr))
 
 _require_fs_space $SCRATCH_MNT $((filesize / 1024 * 3 * 5 / 4))
-real_blksz=$(_get_block_size $testdir)
+real_blksz=$(_get_file_block_size $testdir)
 internal_blks=$((filesize / real_blksz))
 
 echo "Create the original files"