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>
This commit is contained in:
Lu Fengqi
2018-06-21 15:04:22 +08:00
committed by Eryu Guan
parent ec91652eb6
commit 8865de330f
2 changed files with 2 additions and 3 deletions
-1
View File
@@ -223,7 +223,6 @@ case "$HOSTOS" in
export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super) export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super)
export BTRFS_CONVERT_PROG=$(type -P btrfs-convert) export BTRFS_CONVERT_PROG=$(type -P btrfs-convert)
export BTRFS_TUNE_PROG=$(type -P btrfstune) 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 XFS_FSR_PROG=$(type -P xfs_fsr)
export MKFS_NFS_PROG="false" export MKFS_NFS_PROG="false"
export MKFS_CIFS_PROG="false" export MKFS_CIFS_PROG="false"
+2 -2
View File
@@ -39,14 +39,14 @@ _supported_fs btrfs
_supported_os Linux _supported_os Linux
_require_scratch _require_scratch
_require_dm_target flakey _require_dm_target flakey
_require_command "$BTRFS_DEBUG_TREE_PROG" btrfs-debug-tree _require_btrfs_command inspect-internal dump-tree
rm -f $seqres.full rm -f $seqres.full
has_orphan_item() has_orphan_item()
{ {
INO=$1 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 grep -q "key (ORPHAN ORPHAN_ITEM $INO)"; then
return 0 return 0
fi fi