btrfs: replace btrfs-debug-tree with btrfs inspect-internal dump-tree

Since btrfs-dump-tree has been removed from btrfs-progs, use btrfs
inspect-internal dump-tree instead of btrfs-dump-tree.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/config b/common/config
index 09e7ffee30e88fbebd2e52af29fa9a6042a50607..a127e98fba2d62c5853841336df4e66159abf00d 100644 (file)
--- a/common/config
+++ b/common/config
@@ -223,7 +223,6 @@ case "$HOSTOS" in
        export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super)
        export BTRFS_CONVERT_PROG=$(type -P btrfs-convert)
        export BTRFS_TUNE_PROG=$(type -P btrfstune)
-       export BTRFS_DEBUG_TREE_PROG=$(type -P btrfs-debug-tree)
        export XFS_FSR_PROG=$(type -P xfs_fsr)
        export MKFS_NFS_PROG="false"
        export MKFS_CIFS_PROG="false"

diff --git a/tests/btrfs/085 b/tests/btrfs/085
index 8cc69c21c0dd701bfe5156080783b3e6d29a3f1d..4773ed8041fdb50e7a4439122157a0f78053e4d3 100755 (executable)
--- a/tests/btrfs/085
+++ b/tests/btrfs/085
@@ -39,14 +39,14 @@ _supported_fs btrfs
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_command "$BTRFS_DEBUG_TREE_PROG" btrfs-debug-tree
+_require_btrfs_command inspect-internal dump-tree
 
 rm -f $seqres.full
 
 has_orphan_item()
 {
        INO=$1
-       if $BTRFS_DEBUG_TREE_PROG $SCRATCH_DEV | \
+       if $BTRFS_UTIL_PROG inspect-internal dump-tree $SCRATCH_DEV | \
                grep -q "key (ORPHAN ORPHAN_ITEM $INO)"; then
                return 0
        fi