mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
misc: replace more open-coded _scratch_xfs_db calls
Replace the last remaining open-coded calls to xfs_db for the scratch device with calls to _scratch_xfs_db. This fixes these tests when external logs are enabled. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
committed by
Eryu Guan
parent
c25b43fbe7
commit
552a0cdd65
+1
-1
@@ -10,7 +10,7 @@ _zero_position()
|
||||
struct="$2"
|
||||
|
||||
# set values for off/len variables provided by db
|
||||
eval `xfs_db -r -c "$struct" -c stack $SCRATCH_DEV | perl -ne '
|
||||
eval `_scratch_xfs_db -r -c "$struct" -c stack | perl -ne '
|
||||
if (/byte offset (\d+), length (\d+)/) {
|
||||
print "offset=$1\nlength=$2\n"; exit
|
||||
}'`
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@ else
|
||||
_scratch_unmount
|
||||
fi
|
||||
clear=""
|
||||
eval `xfs_db -r -c "sb 1" -c stack $SCRATCH_DEV | perl -ne '
|
||||
eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
|
||||
if (/byte offset (\d+), length (\d+)/) {
|
||||
print "clear=", $1 / 512, "\n"; exit
|
||||
}'`
|
||||
|
||||
+1
-1
@@ -108,7 +108,7 @@ echo "+ check fs" >> $seqres.full
|
||||
_scratch_xfs_repair >> $seqres.full 2>&1 || _fail "should pass initial fsck"
|
||||
|
||||
echo "++ corrupt image" >> $seqres.full
|
||||
xfs_db -x -c blockget -c "blocktrash ${FUZZ_ARGS}" "${SCRATCH_DEV}" >> $seqres.full 2>&1
|
||||
_scratch_xfs_db -x -c blockget -c "blocktrash ${FUZZ_ARGS}" >> $seqres.full 2>&1
|
||||
|
||||
echo "++ mount image" >> $seqres.full
|
||||
_try_scratch_mount >> $seqres.full 2>&1
|
||||
|
||||
Reference in New Issue
Block a user