[PATCH] xfs/649: don't override $SCRATCH_DEV

[PATCH] xfs/649: don't override $SCRATCH_DEV

[Christoph Hellwig]

xfs/649 operates on a scsi_debug device.  Don't try to shoe-horn it
into $SCRATCH_DEV a that causes problems for setups that don't test
a SCRATCH_DEV at all, or which use options for the scratch device that
don't apply to the scsi debug device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/xfs/649 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/xfs/649 b/tests/xfs/649
index 56277c62932e..c2b4b637187f 100755
--- a/tests/xfs/649
+++ b/tests/xfs/649
@@ -41,7 +41,6 @@ _cleanup()
 . ./common/attr
 . ./common/scsi_debug
 
-_require_scratch_nocheck
 _require_scsi_debug "medium_error_start"
 _require_attrs user
 
@@ -55,9 +54,8 @@ scsi_debug_opt_error=${scsi_debug_opt_error:=2}
 test -b $scsi_debug_dev || _notrun "Failed to initialize scsi debug device"
 echo "SCSI debug device $scsi_debug_dev" >>$seqres.full
 
-SCRATCH_DEV=$scsi_debug_dev
-_scratch_mkfs >> $seqres.full || _notrun "could not format filesystem"
-_scratch_mount
+_mkfs_dev $scsi_debug_dev >> $seqres.full || _notrun "could not format filesystem"
+_mount -t xfs $scsi_debug_dev $SCRATCH_MNT
 
 block_size=$(_get_file_block_size $SCRATCH_MNT)
 inode_size=$(_xfs_get_inode_size $SCRATCH_MNT)
@@ -94,10 +92,12 @@ test_attr()
 	local start_blocks=($($XFS_IO_PROG -c "bmap -al" $testfile | awk 'match($3, /[0-9]+/, a) {print a[0]}'))
 	echo "Attribute fork extent(s) start at ${start_blocks[*]}" >> $seqres.full
 
-	_scratch_unmount
+	umount $scsi_debug_dev
 
 	echo "Dump inode $inode details with xfs_db" >> $seqres.full
-	_scratch_xfs_db -c "inode $inode" -c "print core.aformat core.naextents a" >> $seqres.full
+	$XFS_DB_PROG $scsi_debug_dev \
+		-c "inode $inode" -c "print core.aformat core.naextents a" \
+		>> $seqres.full
 
 	if [[ start_blocks[0] -ne 0 ]]; then
 		# Choose the block to error, currently only works with a single extent.
@@ -105,10 +105,11 @@ test_attr()
 	else
 		# Default to the inode daddr when no extents were found.
 		# Errors when getfattr(1) stats the inode and doesnt get to getfattr(2)
-		error_daddr=$(_scratch_xfs_db -c "inode $inode" -c "daddr" | awk '{print $4}')
+		error_daddr=$($XFS_DB_PROG $scsi_debug_dev \
+			-c "inode $inode" -c "daddr" | awk '{print $4}')
 	fi
 
-	_scratch_mount
+	_mount $scsi_debug_dev $SCRATCH_MNT
 
 	echo "Setup scsi_debug to error when reading attributes from block" \
 	     "$error_at_block at daddr $error_daddr" >> $seqres.full
-- 
2.53.0

Re: [PATCH] xfs/649: don't override $SCRATCH_DEV

[Darrick J. Wong]

On Fri, Aug 21, 2026 at 07:14:52AM +0200, Christoph Hellwig wrote:
> xfs/649 operates on a scsi_debug device.  Don't try to shoe-horn it
> into $SCRATCH_DEV a that causes problems for setups that don't test
> a SCRATCH_DEV at all, or which use options for the scratch device that
> don't apply to the scsi debug device.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/649 | 17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/xfs/649 b/tests/xfs/649
> index 56277c62932e..c2b4b637187f 100755
> --- a/tests/xfs/649
> +++ b/tests/xfs/649
> @@ -41,7 +41,6 @@ _cleanup()
>  . ./common/attr
>  . ./common/scsi_debug
>  
> -_require_scratch_nocheck
>  _require_scsi_debug "medium_error_start"
>  _require_attrs user
>  
> @@ -55,9 +54,8 @@ scsi_debug_opt_error=${scsi_debug_opt_error:=2}
>  test -b $scsi_debug_dev || _notrun "Failed to initialize scsi debug device"
>  echo "SCSI debug device $scsi_debug_dev" >>$seqres.full
>  
> -SCRATCH_DEV=$scsi_debug_dev
> -_scratch_mkfs >> $seqres.full || _notrun "could not format filesystem"
> -_scratch_mount
> +_mkfs_dev $scsi_debug_dev >> $seqres.full || _notrun "could not format filesystem"
> +_mount -t xfs $scsi_debug_dev $SCRATCH_MNT

Yeah, that was some braindamaged thinking on my part. :/
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

(and to reply to a comment I made elsewhere -- I don't know that there's
a good generic way to separate mkfs/mount flags for user-visible fs
features vs. multi-device fs configurations.  So maybe I was babbling
nonsense earlier.)

--D

>  
>  block_size=$(_get_file_block_size $SCRATCH_MNT)
>  inode_size=$(_xfs_get_inode_size $SCRATCH_MNT)
> @@ -94,10 +92,12 @@ test_attr()
>  	local start_blocks=($($XFS_IO_PROG -c "bmap -al" $testfile | awk 'match($3, /[0-9]+/, a) {print a[0]}'))
>  	echo "Attribute fork extent(s) start at ${start_blocks[*]}" >> $seqres.full
>  
> -	_scratch_unmount
> +	umount $scsi_debug_dev
>  
>  	echo "Dump inode $inode details with xfs_db" >> $seqres.full
> -	_scratch_xfs_db -c "inode $inode" -c "print core.aformat core.naextents a" >> $seqres.full
> +	$XFS_DB_PROG $scsi_debug_dev \
> +		-c "inode $inode" -c "print core.aformat core.naextents a" \
> +		>> $seqres.full
>  
>  	if [[ start_blocks[0] -ne 0 ]]; then
>  		# Choose the block to error, currently only works with a single extent.
> @@ -105,10 +105,11 @@ test_attr()
>  	else
>  		# Default to the inode daddr when no extents were found.
>  		# Errors when getfattr(1) stats the inode and doesnt get to getfattr(2)
> -		error_daddr=$(_scratch_xfs_db -c "inode $inode" -c "daddr" | awk '{print $4}')
> +		error_daddr=$($XFS_DB_PROG $scsi_debug_dev \
> +			-c "inode $inode" -c "daddr" | awk '{print $4}')
>  	fi
>  
> -	_scratch_mount
> +	_mount $scsi_debug_dev $SCRATCH_MNT
>  
>  	echo "Setup scsi_debug to error when reading attributes from block" \
>  	     "$error_at_block at daddr $error_daddr" >> $seqres.full
> -- 
> 2.53.0
> 
>