Re: [PATCH 03/12] common: add a _check_dev_fs helper

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Dec 10, 2025 at 06:46:49AM +0100, Christoph Hellwig wrote:
> Add a helper to run the file system checker for a given device, and stop
> overloading _check_scratch_fs with the optional device argument that
> creates complication around scratch RT and log devices.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> 
> Note: dmthin should probably do the same as dmflakey does, but all
> my attempts never got the new SCRATCH_DEV value propagated out of
> _dmthin_init.  Maybe someone smarted than me wants to give it another
> try.

One of those dm wrappers has that weird behavior that it has to be
`source'able from a shell invoked by a subprocess.  That's caused me
headaches in the past.

Nevertheless, these changes look ok so
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D


>  common/dmthin     |  6 +++++-
>  common/rc         | 21 +++++++++++++++++----
>  tests/btrfs/176   |  4 ++--
>  tests/generic/648 |  2 +-
>  tests/xfs/601     |  2 +-
>  5 files changed, 26 insertions(+), 9 deletions(-)
> 
> diff --git a/common/dmthin b/common/dmthin
> index a1e1fb8763c0..3bea828d0375 100644
> --- a/common/dmthin
> +++ b/common/dmthin
> @@ -33,7 +33,11 @@ _dmthin_cleanup()
>  _dmthin_check_fs()
>  {
>  	_unmount $SCRATCH_MNT > /dev/null 2>&1
> -	_check_scratch_fs $DMTHIN_VOL_DEV
> +	OLD_SCRATCH_DEV=$SCRATCH_DEV
> +	SCRATCH_DEV=$DMTHIN_VOL_DEV
> +	_check_scratch_fs
> +	SCRATCH_DEV=$OLD_SCRATCH_DEV
> +	unset OLD_SCRATCH_DEV
>  }
>  
>  # Set up a dm-thin device on $SCRATCH_DEV
> diff --git a/common/rc b/common/rc
> index c3cdc220a29b..8618f77a00b5 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3692,14 +3692,14 @@ _check_test_fs()
>      esac
>  }
>  
> -_check_scratch_fs()
> +# check the file system passed in as $1
> +_check_dev_fs()
>  {
> -    local device=$SCRATCH_DEV
> -    [ $# -eq 1 ] && device=$1
> +    local device=$1
>  
>      case $FSTYP in
>      xfs)
> -	_check_xfs_scratch_fs $device
> +	_check_xfs_filesystem $device "none" "none"
>  	;;
>      udf)
>  	_check_udf_filesystem $device $udf_fsize
> @@ -3751,6 +3751,19 @@ _check_scratch_fs()
>      esac
>  }
>  
> +# check the scratch file system
> +_check_scratch_fs()
> +{
> +	case $FSTYP in
> +	xfs)
> +		_check_xfs_scratch_fs $SCRATCH_DEV
> +		;;
> +	*)
> +		_check_dev_fs $SCRATCH_DEV
> +		;;
> +	esac
> +}
> +
>  _full_fstyp_details()
>  {
>       [ -z "$FSTYP" ] && FSTYP=xfs
> diff --git a/tests/btrfs/176 b/tests/btrfs/176
> index 86796c8814a0..f2619bdd8e44 100755
> --- a/tests/btrfs/176
> +++ b/tests/btrfs/176
> @@ -37,7 +37,7 @@ swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1
>  # Deleting device 1 should work again after swapoff.
>  $BTRFS_UTIL_PROG device delete "$scratch_dev1" "$SCRATCH_MNT"
>  _scratch_unmount
> -_check_scratch_fs "$scratch_dev2"
> +_check_dev_fs "$scratch_dev2"
>  
>  echo "Replace device"
>  _scratch_mkfs >> $seqres.full 2>&1
> @@ -55,7 +55,7 @@ swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1
>  $BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT" \
>  	>> $seqres.full
>  _scratch_unmount
> -_check_scratch_fs "$scratch_dev2"
> +_check_dev_fs "$scratch_dev2"
>  
>  # success, all done
>  status=0
> diff --git a/tests/generic/648 b/tests/generic/648
> index 7473c9d33746..1bba78f062cf 100755
> --- a/tests/generic/648
> +++ b/tests/generic/648
> @@ -133,7 +133,7 @@ if [ -f "$loopimg" ]; then
>  		_metadump_dev $DMERROR_DEV $seqres.scratch.final.md
>  		echo "final scratch mount failed"
>  	fi
> -	SCRATCH_RTDEV= SCRATCH_LOGDEV= _check_scratch_fs $loopimg
> +	_check_dev_fs $loopimg
>  fi
>  
>  # success, all done; let the test harness check the scratch fs
> diff --git a/tests/xfs/601 b/tests/xfs/601
> index df382402b958..44911ea389a7 100755
> --- a/tests/xfs/601
> +++ b/tests/xfs/601
> @@ -39,7 +39,7 @@ copy_file=$testdir/copy.img
>  
>  echo copy
>  $XFS_COPY_PROG $SCRATCH_DEV $copy_file >> $seqres.full
> -_check_scratch_fs $copy_file
> +_check_dev_fs $copy_file
>  
>  echo recopy
>  $XFS_COPY_PROG $copy_file $SCRATCH_DEV >> $seqres.full
> -- 
> 2.47.3
> 
>