btrfs: use $FILEFRAG_PROG instead of filefrag
authorXiao Yang <yangx.jy@cn.fujitsu.com>
Fri, 21 Apr 2017 10:10:40 +0000 (18:10 +0800)
committerEryu Guan <eguan@redhat.com>
Mon, 24 Apr 2017 10:01:33 +0000 (18:01 +0800)
$FILEFRAG_PROG has been defined in common/config, so
we could apply it.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
tests/btrfs/004
tests/btrfs/079

index 3f8330f2193cf82dff6bc56f7db8fba765559a68..1b5b124d9a8993b534e3bf7c60cc0bc35b619239 100755 (executable)
@@ -53,7 +53,7 @@ _require_scratch
 _require_no_large_scratch_dev
 _require_btrfs_command inspect-internal logical-resolve
 _require_btrfs_command inspect-internal inode-resolve
-_require_command "/usr/sbin/filefrag" filefrag
+_require_command "$FILEFRAG_PROG" filefrag
 
 rm -f $seqres.full
 
@@ -82,7 +82,7 @@ _filter_extents()
 
 _check_file_extents()
 {
-       cmd="filefrag -v $1"
+       cmd="$FILEFRAG_PROG -v $1"
        echo "# $cmd" >> $seqres.full
        out=`$cmd | _filter_extents`
        if [ -z "$out" ]; then
index ed4eb727ee2b9c50b58d987b2e07981dff56149c..560d5ece0cf8c4173b9d0a316dd526d537261590 100755 (executable)
@@ -60,7 +60,7 @@ _supported_os Linux
 _require_scratch
 # Since xfs_io's fiemap always use SYNC flag and can't be unset,
 # we must use filefrag to call fiemap without SYNC flag.
-_require_command "/usr/sbin/filefrag" filefrag
+_require_command "$FILEFRAG_PROG" filefrag
 _require_xfs_io_command "falloc"
 
 filesize=$((10 * 1024 * 1024 * 1024)) #10G size
@@ -95,7 +95,7 @@ _filter_error() {
 fiemap_work() {
        filename=$1
        while true; do
-               filefrag $filename 2> $tmp.output 1> /dev/null
+               $FILEFRAG_PROG $filename 2> $tmp.output 1> /dev/null
                ret=$?
                err=`cat $tmp.output | _filter_error`
                if [ $ret -ne 0 -o -n "$err" ]; then