From e8d55ba760a54f119e7d3f5a4a3ccf51dcb66f3e Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 24 Jul 2023 08:26:49 -0700
Subject: [PATCH] 731

---
 tests/generic/731 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/generic/731 b/tests/generic/731
index 4a6a2355c..e1400d062 100755
--- a/tests/generic/731
+++ b/tests/generic/731
@@ -13,7 +13,7 @@ _begin_fstest auto quick
 _cleanup()
 {
 	cd /
-	$UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+	$UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
 	_put_scsi_debug_dev
 	rm -f $tmp.*
 }
@@ -27,22 +27,22 @@ _require_block_device $TEST_DEV
 _supported_fs generic
 _require_scsi_debug
 
-physical=`blockdev --getpbsz $SCRATCH_DEV`
-logical=`blockdev --getss $SCRATCH_DEV`
-
-SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300`
+SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256`
 test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device"
 echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
 
-_mkfs_dev $SCSI_DEBUG_DEV
+run_check _mkfs_dev $SCSI_DEBUG_DEV
 
-_mount $SCSI_DEBUG_DEV $SCRATCH_MNT
+SCSI_DEBUG_MNT="$TEST_DIR/scsi_debug_$seq"
+rm -rf $SCSI_DEBUG_MNT
+mkdir $SCSI_DEBUG_MNT
+run_check _mount $SCSI_DEBUG_DEV $SCSI_DEBUG_MNT
 
 # create a test file
-$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCRATCH_MNT/testfile >>$seqres.full
+$XFS_IO_PROG -f -c "pwrite 0 1M" -c "fsync" $SCSI_DEBUG_MNT/testfile >>$seqres.full
 
 # open a file descriptor for reading the file
-exec 3< $SCRATCH_MNT/testfile
+exec 3< $SCSI_DEBUG_MNT/testfile
 
 # drop all caches and delete the scsi debug device
 echo 3 > /proc/sys/vm/drop_caches
-- 
2.51.0