From cbf5cd2a3b76c189d6d4f13d69d68da06f54503c Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Tue, 14 Oct 2014 22:59:38 +1100 Subject: [PATCH] btrfs/010: use _extent_count() helper cleanup to swith _extent_count(), this way we remove a dependence on filefrag. Signed-off-by: Wang Shilong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- tests/btrfs/010 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 tests/btrfs/010 diff --git a/tests/btrfs/010 b/tests/btrfs/010 old mode 100755 new mode 100644 index 371f1b8e..6cfc5615 --- a/tests/btrfs/010 +++ b/tests/btrfs/010 @@ -40,6 +40,7 @@ _cleanup() # get standard environment, filters and checks . ./common/rc . ./common/filter +. ./common/defrag # real QA test starts here @@ -47,7 +48,6 @@ _cleanup() _supported_fs btrfs _supported_os Linux _require_scratch -_require_command "/usr/sbin/filefrag" rm -f $seqres.full @@ -71,9 +71,9 @@ done $BTRFS_UTIL_PROG filesystem defrag $subvol/foobar && sync -num_extent_orig=`filefrag $subvol/foobar | awk -F ' ' '{print $2}'` -num_extent_snap1=`filefrag $SCRATCH_MNT/snap-1/foobar | awk -F ' ' '{print $2}'` -num_extent_snap2=`filefrag $SCRATCH_MNT/snap-2/foobar | awk -F ' ' '{print $2}'` +num_extent_orig=`_extent_count $subvol/foobar` +num_extent_snap1=`_extent_count $SCRATCH_MNT/snap-1/foobar` +num_extent_snap2=`_extent_count $SCRATCH_MNT/snap-2/foobar` echo "$num_extent_orig $num_extent_snap1 $num_extent_snap2" >> $seqres.full -- 2.39.5