* [PATCH 2/3] misc: fix fallocate commands that need the unshare switch
2016-10-14 18:12 [PATCH 0/3] xfstests: fix tests for rmap/reflink Darrick J. Wong
2016-10-14 18:12 ` [PATCH 1/3] xfs: set the refcount btree cowflag when setting up cow Darrick J. Wong
@ 2016-10-14 18:13 ` Darrick J. Wong
2016-10-15 17:03 ` Christoph Hellwig
2016-10-14 18:13 ` [PATCH 3/3] misc: fix more xfs_db usage Darrick J. Wong
2 siblings, 1 reply; 9+ messages in thread
From: Darrick J. Wong @ 2016-10-14 18:13 UTC (permalink / raw)
To: david, eguan, darrick.wong; +Cc: linux-xfs, fstests
We re-added the UNSHARE flag to fallocate, so go make sure that all
the unshare tests actually check that the xfs_io falloc command
supports that flag.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/generic/156 | 16 ++++++----------
tests/generic/264 | 4 ++--
tests/xfs/132 | 12 ++++++------
tests/xfs/184 | 3 ++-
tests/xfs/192 | 3 ++-
tests/xfs/200 | 3 ++-
tests/xfs/204 | 3 ++-
tests/xfs/344 | 1 +
tests/xfs/345 | 1 +
tests/xfs/346 | 1 +
tests/xfs/347 | 1 +
11 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/tests/generic/156 b/tests/generic/156
index 9e22a02..b1b354b 100755
--- a/tests/generic/156
+++ b/tests/generic/156
@@ -54,15 +54,11 @@ _cleanup()
. ./common/attr
. ./common/reflink
-if [ $FSTYP = "btrfs" ]; then
- _notrun "btrfs doesn't handle unshare on fallocate"
-fi
-
# real QA test starts here
_supported_os Linux
_require_test_reflink
_require_cp_reflink
-_require_xfs_io_command "falloc"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
@@ -89,18 +85,18 @@ _test_cycle_mount
free_blocks1=$(stat -f $testdir -c '%f')
echo "funshare part of a file"
-$XFS_IO_PROG -f -c "falloc 0 $((sz / 2))" $testdir/file2
+$XFS_IO_PROG -f -c "falloc -u 0 $((sz / 2))" $testdir/file2
_test_cycle_mount
echo "funshare some of the copies"
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file2
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file3
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file2
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file3
_test_cycle_mount
free_blocks2=$(stat -f $testdir -c '%f')
echo "funshare the rest of the files"
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file4
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file1
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file4
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file1
_test_cycle_mount
free_blocks3=$(stat -f $testdir -c '%f')
diff --git a/tests/generic/264 b/tests/generic/264
index 631184c..bc2f7e6 100755
--- a/tests/generic/264
+++ b/tests/generic/264
@@ -47,7 +47,7 @@ _cleanup()
_supported_os Linux
_require_scratch_reflink
_require_cp_reflink
-_require_xfs_io_command "falloc"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
@@ -75,7 +75,7 @@ md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file2.chk | _filter_scratch
echo "CoW and unmount"
-$XFS_IO_PROG -f -c "pwrite -S 0x62 -b $((blksz * 3)) $blksz $((blksz * 3))" -c "falloc $((blksz * 2)) $blksz" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "pwrite -S 0x62 -b $((blksz * 3)) $blksz $((blksz * 3))" -c "falloc -u $((blksz * 2)) $blksz" $testdir/file2 >> $seqres.full
_scratch_cycle_mount
$XFS_IO_PROG -f -c "pwrite -S 0x62 -b $((blksz * 3)) $blksz $((blksz * 3))" $testdir/file2.chk >> $seqres.full
_scratch_cycle_mount
diff --git a/tests/xfs/132 b/tests/xfs/132
index 7f7ebaa..6b8c05c 100755
--- a/tests/xfs/132
+++ b/tests/xfs/132
@@ -63,7 +63,7 @@ _supported_os Linux
_require_test_reflink
_require_test_lsattr
_require_cp_reflink
-_require_xfs_io_command "falloc"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
@@ -90,18 +90,18 @@ _test_cycle_mount
free_blocks1=$(stat -f $testdir -c '%f')
echo "funshare part of a file"
-$XFS_IO_PROG -f -c "falloc 0 $((sz / 2))" $testdir/file2
+$XFS_IO_PROG -f -c "falloc -u 0 $((sz / 2))" $testdir/file2
_test_cycle_mount
echo "funshare some of the copies"
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file2
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file3
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file2
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file3
_test_cycle_mount
free_blocks2=$(stat -f $testdir -c '%f')
echo "funshare the rest of the files"
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file4
-$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file1
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file4
+$XFS_IO_PROG -f -c "falloc -u 0 $sz" $testdir/file1
_test_cycle_mount
free_blocks3=$(stat -f $testdir -c '%f')
diff --git a/tests/xfs/184 b/tests/xfs/184
index e843b4e..af416e5 100755
--- a/tests/xfs/184
+++ b/tests/xfs/184
@@ -51,6 +51,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
@@ -84,7 +85,7 @@ md5sum $testdir/file2 | _filter_scratch
echo "CoW and unmount"
$XFS_IO_PROG -f -c "cowextsize" $testdir/file2 >> $seqres.full
$XFS_IO_PROG -f -c "pwrite -R -S 0x63 -b $real_blksz 0 $((filesize + 1))" -c "fdatasync" $testdir/file2 >> $seqres.full
-$XFS_IO_PROG -f -c "falloc 0 $((filesize + 1))" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "falloc -u 0 $((filesize + 1))" $testdir/file2 >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
diff --git a/tests/xfs/192 b/tests/xfs/192
index 01f5e1c..691b0a1 100755
--- a/tests/xfs/192
+++ b/tests/xfs/192
@@ -51,6 +51,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
_require_odirect
rm -f $seqres.full
@@ -85,7 +86,7 @@ md5sum $testdir/file2 | _filter_scratch
echo "CoW and unmount"
$XFS_IO_PROG -f -c "cowextsize" $testdir/file2 >> $seqres.full
$XFS_IO_PROG -d -f -c "pwrite -R -S 0x63 -b $real_blksz 0 $filesize" $testdir/file2 >> $seqres.full
-$XFS_IO_PROG -d -f -c "falloc 0 $filesize" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -d -f -c "falloc -u 0 $filesize" $testdir/file2 >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
diff --git a/tests/xfs/200 b/tests/xfs/200
index ebb6e73..b9f2685 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -53,6 +53,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
@@ -88,7 +89,7 @@ $XFS_IO_PROG -f -c "cowextsize" $testdir/file2 >> $seqres.full
cat $testdir/file2 > /dev/null
$XFS_IO_PROG -f -c "pwrite -R -S 0x63 -b $real_blksz 0 $filesize" -c "fdatasync" $testdir/file2 >> $seqres.full
$XFS_IO_PROG -f -c "fadvise -d 0 $filesize" -c "fsync" $testdir/file2 >> $seqres.full
-$XFS_IO_PROG -f -c "falloc 0 $filesize" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "falloc -u 0 $filesize" $testdir/file2 >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
diff --git a/tests/xfs/204 b/tests/xfs/204
index 6e5b896..4917fc0 100755
--- a/tests/xfs/204
+++ b/tests/xfs/204
@@ -53,6 +53,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
_require_odirect
rm -f $seqres.full
@@ -89,7 +90,7 @@ $XFS_IO_PROG -f -c "cowextsize" $testdir/file2 >> $seqres.full
cat $testdir/file2 > /dev/null
$XFS_IO_PROG -d -f -c "pwrite -R -S 0x63 -b $real_blksz 0 $filesize" -c "fdatasync" $testdir/file2 >> $seqres.full
$XFS_IO_PROG -f -c "fadvise -d 0 $filesize" -c "fsync" $testdir/file2 >> $seqres.full
-$XFS_IO_PROG -f -c "falloc 0 $filesize" $testdir/file2 >> $seqres.full
+$XFS_IO_PROG -f -c "falloc -u 0 $filesize" $testdir/file2 >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
diff --git a/tests/xfs/344 b/tests/xfs/344
index 25bff1a..8b2f6a5 100755
--- a/tests/xfs/344
+++ b/tests/xfs/344
@@ -51,6 +51,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
_require_odirect
rm -f $seqres.full
diff --git a/tests/xfs/345 b/tests/xfs/345
index edb4443..1bb1db3 100755
--- a/tests/xfs/345
+++ b/tests/xfs/345
@@ -50,6 +50,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
diff --git a/tests/xfs/346 b/tests/xfs/346
index d0463eb..17c1050 100755
--- a/tests/xfs/346
+++ b/tests/xfs/346
@@ -51,6 +51,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
_require_odirect
rm -f $seqres.full
diff --git a/tests/xfs/347 b/tests/xfs/347
index 1578216..94898e7 100755
--- a/tests/xfs/347
+++ b/tests/xfs/347
@@ -51,6 +51,7 @@ _require_scratch_reflink
_require_cp_reflink
_require_fiemap
_require_xfs_io_command "cowextsize"
+_require_xfs_io_command "falloc" "-u"
rm -f $seqres.full
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] misc: fix more xfs_db usage
2016-10-14 18:12 [PATCH 0/3] xfstests: fix tests for rmap/reflink Darrick J. Wong
2016-10-14 18:12 ` [PATCH 1/3] xfs: set the refcount btree cowflag when setting up cow Darrick J. Wong
2016-10-14 18:13 ` [PATCH 2/3] misc: fix fallocate commands that need the unshare switch Darrick J. Wong
@ 2016-10-14 18:13 ` Darrick J. Wong
2016-10-15 17:03 ` Christoph Hellwig
2 siblings, 1 reply; 9+ messages in thread
From: Darrick J. Wong @ 2016-10-14 18:13 UTC (permalink / raw)
To: david, eguan, darrick.wong; +Cc: linux-xfs, fstests
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/xfs/004 | 2 +-
tests/xfs/007 | 8 ++++----
tests/xfs/021 | 4 ++--
tests/xfs/044 | 2 +-
tests/xfs/052 | 2 +-
tests/xfs/116 | 4 ++--
tests/xfs/136 | 6 +++---
tests/xfs/199 | 6 +++---
tests/xfs/278 | 16 ++++++++--------
tests/xfs/291 | 2 +-
tests/xfs/307 | 20 ++++++++++----------
tests/xfs/308 | 20 ++++++++++----------
12 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/tests/xfs/004 b/tests/xfs/004
index 59b8997..09da2fe 100755
--- a/tests/xfs/004
+++ b/tests/xfs/004
@@ -74,7 +74,7 @@ eval `$DF_PROG $SCRATCH_MNT 2>&1 \
echo "df gave: blocks=$blocks used=$used avail=$avail" >>$seqres.full
echo "blocksize from mkfs is '$dbsize'" >>$seqres.full
-xfs_db -r -c "freesp -s" $SCRATCH_DEV >$tmp.xfs_db
+_scratch_xfs_db -r -c "freesp -s" >$tmp.xfs_db
echo "xfs_db for $SCRATCH_DEV" >>$seqres.full
cat $tmp.xfs_db >>$seqres.full
diff --git a/tests/xfs/007 b/tests/xfs/007
index f2e3584..eb2c9b3 100755
--- a/tests/xfs/007
+++ b/tests/xfs/007
@@ -68,8 +68,8 @@ do_test()
grep $qino_2 | awk '{print $NF}'`
echo "*** Usage before quotarm ***"
- xfs_db -c "inode $QINO_1" -c "p core.nblocks" $SCRATCH_DEV
- xfs_db -c "inode $QINO_2" -c "p core.nblocks" $SCRATCH_DEV
+ _scratch_xfs_db -c "inode $QINO_1" -c "p core.nblocks"
+ _scratch_xfs_db -c "inode $QINO_2" -c "p core.nblocks"
_qmount
echo "*** turn off $off_opts quotas"
@@ -79,8 +79,8 @@ do_test()
_scratch_unmount
echo "*** Usage after quotarm ***"
- xfs_db -c "inode $QINO_1" -c "p core.nblocks" $SCRATCH_DEV
- xfs_db -c "inode $QINO_2" -c "p core.nblocks" $SCRATCH_DEV
+ _scratch_xfs_db -c "inode $QINO_1" -c "p core.nblocks"
+ _scratch_xfs_db -c "inode $QINO_2" -c "p core.nblocks"
}
diff --git a/tests/xfs/021 b/tests/xfs/021
index 795b71c..67a4346 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -130,14 +130,14 @@ _scratch_unmount >>$seqres.full 2>&1 \
echo "*** dump attributes (1)"
-xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV | \
+_scratch_xfs_db -r -c "inode $inum_1" -c "print a.sfattr" | \
sed -e '/secure = /d' | sed -e '/parent = /d'
echo "*** dump attributes (2)"
# There is a fair bit of filtering here to convert v5 filesystem output
# into the v4 format that holds the meaningful information for the test.
-xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print $SCRATCH_DEV \
+_scratch_xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print \
| perl -ne '
s/,secure//;
s/,parent//;
diff --git a/tests/xfs/044 b/tests/xfs/044
index ea58c07..fc5dae0 100755
--- a/tests/xfs/044
+++ b/tests/xfs/044
@@ -130,7 +130,7 @@ _check_mount
_check_require_logdev
echo "*** set uuid"
-xfs_db -x $SCRATCH_DEV -l $SCRATCH_LOGDEV -c "uuid 02020202-0202-0202-0202-020202020202"
+_scratch_xfs_db -x -l $SCRATCH_LOGDEV -c "uuid 02020202-0202-0202-0202-020202020202"
[ $? -ne 0 ] && _unexpected
_check_mount
diff --git a/tests/xfs/052 b/tests/xfs/052
index 18cf037..56231f3 100755
--- a/tests/xfs/052
+++ b/tests/xfs/052
@@ -110,7 +110,7 @@ cat $tmp.quota >> $seqres.full
_scratch_unmount
# note - does (insitu) conversion from fs blocks to 1K blocks
-xfs_db -rc "dquot -$type $id" -c p $SCRATCH_DEV | tee -a $seqres.full | perl -ne '
+_scratch_xfs_db -rc "dquot -$type $id" -c p | tee -a $seqres.full | perl -ne '
if (/^diskdq.bcount = (\d+)$/) {
print "used_blocks=", $1 * '$dbsize' / 1024, "\n";
}
diff --git a/tests/xfs/116 b/tests/xfs/116
index 2dabde9..1d13d15 100755
--- a/tests/xfs/116
+++ b/tests/xfs/116
@@ -55,10 +55,10 @@ _require_xfs_quota
_scratch_mkfs >/dev/null 2>&1
_scratch_mount "-o uquota"
_scratch_unmount
-xfs_db -r -c sb -c print $SCRATCH_DEV | grep qflags
+_scratch_xfs_db -r -c sb -c print | grep qflags
_scratch_mount
_scratch_unmount
-xfs_db -r -c sb -c print $SCRATCH_DEV | grep qflags
+_scratch_xfs_db -r -c sb -c print | grep qflags
# success, all done
status=0
diff --git a/tests/xfs/136 b/tests/xfs/136
index 679fa9f..6256215 100755
--- a/tests/xfs/136
+++ b/tests/xfs/136
@@ -103,7 +103,7 @@ do_extents()
_print_inode()
{
_scratch_unmount
- xfs_db -r -c "inode $inum" -c "print" $SCRATCH_DEV |\
+ _scratch_xfs_db -r -c "inode $inum" -c "print" |\
awk '
/nextents/ { print; next }
/naextents/ { print; next }
@@ -119,14 +119,14 @@ _print_inode()
_print_inode_u()
{
_scratch_unmount
- xfs_db -r -c "inode $inum" -c "print u" $SCRATCH_DEV
+ _scratch_xfs_db -r -c "inode $inum" -c "print u"
_scratch_mount
}
_print_inode_a()
{
_scratch_unmount
- xfs_db -r -c "inode $inum" -c "print a" $SCRATCH_DEV
+ _scratch_xfs_db -r -c "inode $inum" -c "print a"
_scratch_mount
}
diff --git a/tests/xfs/199 b/tests/xfs/199
index 3133893..ee26439 100755
--- a/tests/xfs/199
+++ b/tests/xfs/199
@@ -51,7 +51,7 @@ _require_scratch
get_features()
{
- xfs_db -x $SCRATCH_DEV -c "sb" -c "print $1" | awk '// {print $3}'
+ _scratch_xfs_db -x -c "sb" -c "print $1" | awk '// {print $3}'
}
# clear any mkfs options so that we can directly specify the options we need to
@@ -70,7 +70,7 @@ bf2=`get_features bad_features2`
# Now clear the normal flags
#
echo "Clearing features2:"
-xfs_db -x $SCRATCH_DEV -c 'sb' -c 'write features2 0'
+_scratch_xfs_db -x -c 'sb' -c 'write features2 0'
_scratch_mount
_scratch_unmount
@@ -80,7 +80,7 @@ rwf2=`get_features features2`
# Clear the normal flags again for the second rount.
#
echo "Clearing features2:"
-xfs_db -x $SCRATCH_DEV -c 'sb' -c 'write features2 0'
+_scratch_xfs_db -x -c 'sb' -c 'write features2 0'
#
# And print the flags after a mount ro and remount rw
diff --git a/tests/xfs/278 b/tests/xfs/278
index caf2622..b94ee9c 100755
--- a/tests/xfs/278
+++ b/tests/xfs/278
@@ -62,16 +62,16 @@ _scratch_unmount
echo "Silence is goodness..."
# Corrupt DIR
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].inumber.i4 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].name 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].offset 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.list[0].namelen 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $DIR_INO" -c "write core.nlinkv2 0" >> $seqres.full
# Corrupt SUBDIR
-xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" $SCRATCH_DEV >> $seqres.full
-xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" $SCRATCH_DEV >> $seqres.full
+_scratch_xfs_db -x -c "inode $SUBDIR_INO" -c "write u.sfdir2.hdr.parent.i4 0" >> $seqres.full
+_scratch_xfs_db -x -c "inode $SUBDIR_INO" -c "write core.nlinkv2 0" >> $seqres.full
echo "===== BEGIN of xfs_repair =====" >> $seqres.full
echo "" >>$seqres.full
diff --git a/tests/xfs/291 b/tests/xfs/291
index c226e65..808f333 100755
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -73,7 +73,7 @@ xfs_io -f -c "pwrite 0 16m" -c "fsync" $SCRATCH_MNT/space_file.large >> $seqres.
# Take a look at freespace for any post-mortem on the test
_scratch_unmount
-xfs_db -r -c freesp $SCRATCH_DEV >> $seqres.full 2>&1
+_scratch_xfs_db -r -c freesp >> $seqres.full 2>&1
_scratch_mount
# Step 2: Make a bunch of (hopefully fragmented) multiblock
diff --git a/tests/xfs/307 b/tests/xfs/307
index 2a99459..427d2fe 100755
--- a/tests/xfs/307
+++ b/tests/xfs/307
@@ -59,7 +59,7 @@ _get_agf_data() {
field="$1"
shift
- xfs_db -c 'agf 1' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}'
+ _scratch_xfs_db -c 'agf 1' "$@" -c "p $field" | awk '{print $3}'
}
_set_agf_data() {
@@ -67,14 +67,14 @@ _set_agf_data() {
value="$2"
shift; shift
- xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full
+ _scratch_xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" >> $seqres.full
}
_get_sb_data() {
field="$1"
shift
- xfs_db -c 'sb 0' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}'
+ _scratch_xfs_db -c 'sb 0' "$@" -c "p $field" | awk '{print $3}'
}
_set_sb_data() {
@@ -82,7 +82,7 @@ _set_sb_data() {
value="$2"
shift; shift
- xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full
+ _scratch_xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" >> $seqres.full
}
_filter_leftover() {
@@ -91,17 +91,17 @@ _filter_leftover() {
_dump_status() {
echo "** " "$@"
- xfs_db -c 'sb 0' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'sb 0' -c p
echo "** agf header"
- xfs_db -c 'agf 1' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c p
echo "** refcntbt"
- xfs_db -c 'agf 1' -c 'addr refcntroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr refcntroot' -c p
echo "** rmapbt"
- test $is_rmap -gt 0 && xfs_db -c 'agf 1' -c 'addr rmaproot' -c p $SCRATCH_DEV
+ test $is_rmap -gt 0 && _scratch_xfs_db -c 'agf 1' -c 'addr rmaproot' -c p
echo "** bnobt"
- xfs_db -c 'agf 1' -c 'addr bnoroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr bnoroot' -c p
echo "** cntbt"
- xfs_db -c 'agf 1' -c 'addr cntroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr cntroot' -c p
}
echo "We need AG1 to have a single free extent"
diff --git a/tests/xfs/308 b/tests/xfs/308
index 5bfa432..e14586d 100755
--- a/tests/xfs/308
+++ b/tests/xfs/308
@@ -59,7 +59,7 @@ _get_agf_data() {
field="$1"
shift
- xfs_db -c 'agf 1' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}'
+ _scratch_xfs_db -c 'agf 1' "$@" -c "p $field" | awk '{print $3}'
}
_set_agf_data() {
@@ -67,14 +67,14 @@ _set_agf_data() {
value="$2"
shift; shift
- xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full
+ _scratch_xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" >> $seqres.full
}
_get_sb_data() {
field="$1"
shift
- xfs_db -c 'sb 0' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}'
+ _scratch_xfs_db -c 'sb 0' "$@" -c "p $field" | awk '{print $3}'
}
_set_sb_data() {
@@ -82,7 +82,7 @@ _set_sb_data() {
value="$2"
shift; shift
- xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full
+ _scratch_xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" >> $seqres.full
}
_filter_leftover() {
@@ -91,17 +91,17 @@ _filter_leftover() {
_dump_status() {
echo "** " "$@"
- xfs_db -c 'sb 0' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'sb 0' -c p
echo "** agf header"
- xfs_db -c 'agf 1' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c p
echo "** refcntbt"
- xfs_db -c 'agf 1' -c 'addr refcntroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr refcntroot' -c p
echo "** rmapbt"
- test $is_rmap -gt 0 && xfs_db -c 'agf 1' -c 'addr rmaproot' -c p $SCRATCH_DEV
+ test $is_rmap -gt 0 && _scratch_xfs_db -c 'agf 1' -c 'addr rmaproot' -c p
echo "** bnobt"
- xfs_db -c 'agf 1' -c 'addr bnoroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr bnoroot' -c p
echo "** cntbt"
- xfs_db -c 'agf 1' -c 'addr cntroot' -c p $SCRATCH_DEV
+ _scratch_xfs_db -c 'agf 1' -c 'addr cntroot' -c p
}
echo "We need AG1 to have a single free extent"
^ permalink raw reply related [flat|nested] 9+ messages in thread