From 8865de330fcd671e346075fff927453f46d60eb3 Mon Sep 17 00:00:00 2001 From: Lu Fengqi Date: Thu, 21 Jun 2018 15:04:22 +0800 Subject: [PATCH] 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 Reviewed-by: Nikolay Borisov Signed-off-by: Eryu Guan --- common/config | 1 - tests/btrfs/085 | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/config b/common/config index 09e7ffee..a127e98f 100644 --- 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 8cc69c21..4773ed80 100755 --- 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 -- 2.39.5