mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
misc: fix _get_file_block_size usage
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>
This commit is contained in:
committed by
Eryu Guan
parent
f220ab921e
commit
0d444a9a29
+1
-1
@@ -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))
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user