Re: [PATCH 03/13] xfs: add a XFS_VERIFY_FILE_DATA variable

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

On Thu, Sep 24, 2026 at 12:07:44PM +0200, Christoph Hellwig wrote:
> Add an option to run the end of testt xfs_scrub call using the -x

                                  test

> option to also check file data validity.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  README     | 3 +++
>  common/xfs | 8 +++++++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/README b/README
> index cc03f51e1ad3..0ce7d4463354 100644
> --- a/README
> +++ b/README
> @@ -326,6 +326,9 @@ Extra XFS specification:
>   - xfs_scrub, if present, will always check the test and scratch
>     filesystems if they are still online at the end of the test. It is no
>     longer necessary to set TEST_XFS_SCRUB.
> + - Set XFS_VERIFY_FILE_DATA option to also check file data integrity using the
> +   -x option to xfs_scrub.  This makes the xfs_scrub based checks a lot slower,
> +   but verifies the data checksum support in XFS.
>  
>  Tools specification:
>   - dump:
> diff --git a/common/xfs b/common/xfs
> index 98981e624dda..8254e48603af 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -875,6 +875,12 @@ _check_xfs_filesystem()
>  	# Run online scrub if we can.
>  	mntpt="$(_is_dev_mounted $device)"
>  	if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then
> +		local xfs_scrub_opts="-v -d -n"
> +
> +		if [ -n "$XFS_VERIFY_FILE_DATA" ]; then
> +			xfs_scrub_opts="$xfs_scrub_opts -x"
> +		fi

/me wonders if you should use bash arrays here but seeing as we just got
burned by that I'll defer to Zorro if he prefers that or not.

With the typo fixed, this looks ok to me.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> +
>  		can_scrub=1
>  
>  		# Tests can create a scenario in which a call to syncfs() issued
> @@ -888,7 +894,7 @@ _check_xfs_filesystem()
>  		# before executing a scrub operation.
>  		$XFS_IO_PROG -c syncfs $mntpt >> $seqres.full 2>&1
>  
> -		"$XFS_SCRUB_PROG" -v -d -n $mntpt > $tmp.scrub 2>&1
> +		"$XFS_SCRUB_PROG" $xfs_scrub_opts $mntpt > $tmp.scrub 2>&1
>  		if [ $? -ne 0 ]; then
>  			_log_err "_check_xfs_filesystem: filesystem on $device failed scrub"
>  			echo "*** xfs_scrub -v -d -n output ***" >> $seqres.full
> -- 
> 2.53.0
> 
>