Re: [PATCH v6 03/12] common/rc: Add a helper to run fsx on a given file

[John Garry <john.g.garry@oracle.com>]

On 11/09/2025 18:13, Ojaswin Mujoo wrote:
> Currently run_fsx is hardcoded to run on a file in $TEST_DIR.
> Add a helper _run_fsx_on_file so that we can run fsx on any
> given file including in $SCRATCH_MNT. Also, refactor _run_fsx
> to use this helper.
> 
> No functional change is intended in this patch.
> 
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>

Reviewed-by: John Garry <john.g.garry@oracle.com>

> ---
>   common/rc | 23 ++++++++++++++++++++---
>   1 file changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index 8a023b9d..ac77a650 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -5203,13 +5203,24 @@ _require_hugepage_fsx()
>   		_notrun "fsx binary does not support MADV_COLLAPSE"
>   }
>   
> -_run_fsx()
> +_run_fsx_on_file()
>   {
> +	local testfile=$1
> +	shift
> +
> +	if ! [ -f $testfile ]
> +	then
> +		echo "_run_fsx_on_file: $testfile doesn't exist. Creating" >> $seqres.full
> +		touch $testfile
> +	fi
> +
>   	echo "fsx $*"
>   	local args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
> -	set -- $FSX_PROG $args $FSX_AVOID $TEST_DIR/junk
> +
> +	set -- $FSX_PROG $args $FSX_AVOID $testfile
> +
>   	echo "$@" >>$seqres.full
> -	rm -f $TEST_DIR/junk
> +	rm -f $testfile
>   	"$@" 2>&1 | tee -a $seqres.full >$tmp.fsx
>   	local res=${PIPESTATUS[0]}
>   	if [ $res -ne 0 ]; then
> @@ -5221,6 +5232,12 @@ _run_fsx()
>   	return 0
>   }
>   
> +_run_fsx()
> +{
> +	_run_fsx_on_file $TEST_DIR/junk $@
> +	return $?
> +}
> +
>   # Run fsx with -h(ugepage buffers).  If we can't set up a hugepage then skip
>   # the test, but if any other error occurs then exit the test.
>   _run_hugepage_fsx() {