On Thu, Sep 22, 2022 at 08:38:35AM +0200, Pavel Reichl wrote:
> Helper that creates files of specified size using falloc if supported,
> otherwise pwrite is used.
>
> Signed-off-by: Pavel Reichl <preichl@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Technically speaking, I only RVB-tagged the second patch, not this first
one...
> ---
> common/rc | 23 +++++++++++++++++++++++
> tests/generic/694 | 8 +++++++-
> 2 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/common/rc b/common/rc
> index a25cbcd0..228fcb37 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -4925,6 +4925,29 @@ hexdump()
> _fail "Use _hexdump(), please!"
> }
>
> +# Try to create a file with inode->i_blocks >= (length / blocksize).
> +# There may be some small overhead, e.g. ext2 filesystem allocates a
> +# substantial number of blocks to store block mappings. Those are accounted
> +# to i_blocks.
> +_create_file_sized()
> +{
> + local length=$1
> + local file=$2
> + local tmp=`mktemp -u`
> + local ret=0
> +
> + $XFS_IO_PROG -ft -c "falloc 0 $length" $file >$tmp.out 2>&1
> + ret=$?
> + if (grep -Eq "Operation not supported|command .* not found" $tmp.out);then
> + # fallocate isn't supported, fallback to general buffer write
> + $XFS_IO_PROG -ft -c "pwrite 0 $length" $file >$tmp.out 2>&1
> + ret=$?
> + fi
> + [ $ret -ne 0 ] && cat $tmp.out
> + rm -f $tmp.out
> + return $ret
> +}
> +
> init_rc
>
> ################################################################################
> diff --git a/tests/generic/694 b/tests/generic/694
> index dfd988df..c96c2154 100755
> --- a/tests/generic/694
> +++ b/tests/generic/694
> @@ -21,6 +21,9 @@ _cleanup()
> }
>
> _supported_fs generic
> +_fixed_by_kernel_commit 0c336d6e33f4 \
> + "exfat: fix incorrect loading of i_blocks for large file"
> +
> _require_test
> _require_fs_space $TEST_DIR $((4 * 1024 * 1024)) #kB
>
> @@ -30,7 +33,10 @@ junk_dir=$TEST_DIR/$seq
> junk_file=$junk_dir/junk
> mkdir -p $junk_dir
>
> -$XFS_IO_PROG -f -c "pwrite -W 0 4G" $junk_file > /dev/null
> +_create_file_sized 4G $junk_file
> +if [ $? -ne 0 ]; then
> + echo "Could not create 4G test file"
...but this does look good now.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> +fi
>
> iblocks=`stat -c '%b' $junk_file`
>
> --
> 2.37.3
>
