xfs: abstract xfs_info into $XFS_INFO_PROG

Abstract calls to xfs_info into $XFS_INFO_PROG like we do for all
other xfs utilities.

[Eryu: require xfs_info to be present if FSTYP is xfs]

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/attr b/common/attr
index 3d1385a493b038d6eca14f246b31b4779e1a665f..49679d3cf3c6c0ac4a23ea0f1b0965472911d798 100644 (file)
--- a/common/attr
+++ b/common/attr
@@ -30,7 +30,7 @@ _acl_get_max()
                # CRC format filesystems have much larger ACL counts. The actual
                # number is into the thousands, but testing that meany takes too
                # long, so just test well past the old limit of 25.
-               xfs_info $TEST_DIR | _filter_mkfs > /dev/null 2> $tmp.info
+               $XFS_INFO_PROG $TEST_DIR | _filter_mkfs > /dev/null 2> $tmp.info
                . $tmp.info
                rm $tmp.info
                if [ $_fs_has_crcs -eq 0 ]; then

diff --git a/common/config b/common/config
index 221581de212d9366e2c85b896a453b28cbe948d6..d5150050d08da98c1ceefcd32343d2084aae26f9 100644 (file)
--- a/common/config
+++ b/common/config
@@ -205,6 +205,7 @@ export TIMEOUT_PROG="$(type -P timeout)"
 export SETCAP_PROG="$(type -P setcap)"
 export GETCAP_PROG="$(type -P getcap)"
 export CHECKBASHISMS_PROG="$(type -P checkbashisms)"
+export XFS_INFO_PROG="$(type -P xfs_info)"
 
 # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
 # newer systems have udevadm command but older systems like RHEL5 don't.

diff --git a/common/populate b/common/populate
index 07ea7e60a4204c2a7e1117785d6149d215705275..b2dd053ff781e2a4e4d50b4db57c23e6a73b3183 100644 (file)
--- a/common/populate
+++ b/common/populate
@@ -117,7 +117,7 @@ _populate_xfs_qmount_option()
        fi
 
        # Turn on all the quotas
-       if xfs_info "${TEST_DIR}" | grep -q 'crc=1'; then
+       if $XFS_INFO_PROG "${TEST_DIR}" | grep -q 'crc=1'; then
                # v5 filesystems can have group & project quotas
                quota="usrquota,grpquota,prjquota"
        else
@@ -151,7 +151,7 @@ _scratch_xfs_populate() {
        _populate_xfs_qmount_option
        _scratch_mount
        blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
-       dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+       dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
        leaf_lblk="$((32 * 1073741824 / blksz))"
        node_lblk="$((64 * 1073741824 / blksz))"
 
@@ -267,7 +267,7 @@ _scratch_xfs_populate() {
        ./src/punch-alternating "${SCRATCH_MNT}/BNOBT"
 
        # Reverse-mapping btree
-       is_rmapbt="$(xfs_info "${SCRATCH_MNT}" | grep -c 'rmapbt=1')"
+       is_rmapbt="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'rmapbt=1')"
        if [ $is_rmapbt -gt 0 ]; then
                echo "+ rmapbt btree"
                nr="$((blksz * 2 / 24))"
@@ -276,7 +276,7 @@ _scratch_xfs_populate() {
        fi
 
        # Realtime Reverse-mapping btree
-       is_rt="$(xfs_info "${SCRATCH_MNT}" | grep -c 'rtextents=[1-9]')"
+       is_rt="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'rtextents=[1-9]')"
        if [ $is_rmapbt -gt 0 ] && [ $is_rt -gt 0 ]; then
                echo "+ rtrmapbt btree"
                nr="$((blksz * 2 / 32))"
@@ -285,7 +285,7 @@ _scratch_xfs_populate() {
        fi
 
        # Reference-count btree
-       is_reflink="$(xfs_info "${SCRATCH_MNT}" | grep -c 'reflink=1')"
+       is_reflink="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'reflink=1')"
        if [ $is_reflink -gt 0 ]; then
                echo "+ reflink btree"
                nr="$((blksz * 2 / 12))"
@@ -534,12 +534,12 @@ _scratch_xfs_populate_check() {
        leaf_attr="$(__populate_find_inode "${SCRATCH_MNT}/ATTR.FMT_LEAF")"
        node_attr="$(__populate_find_inode "${SCRATCH_MNT}/ATTR.FMT_NODE")"
        btree_attr="$(__populate_find_inode "${SCRATCH_MNT}/ATTR.FMT_BTREE")"
-       is_finobt=$(xfs_info "${SCRATCH_MNT}" | grep -c 'finobt=1')
-       is_rmapbt=$(xfs_info "${SCRATCH_MNT}" | grep -c 'rmapbt=1')
-       is_reflink=$(xfs_info "${SCRATCH_MNT}" | grep -c 'reflink=1')
+       is_finobt=$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'finobt=1')
+       is_rmapbt=$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'rmapbt=1')
+       is_reflink=$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep -c 'reflink=1')
 
        blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
-       dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+       dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
        leaf_lblk="$((32 * 1073741824 / blksz))"
        node_lblk="$((64 * 1073741824 / blksz))"
        umount "${SCRATCH_MNT}"

diff --git a/common/rc b/common/rc
index f04c9ea2fd89db90256a2f11e0dddc09d42249aa..9d6665b6c4d789bb75a5ef7b4c16f1dc21d78b0a 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -136,6 +136,7 @@ case "$FSTYP" in
         [ "$XFS_REPAIR_PROG" = "" ] && _fatal "xfs_repair not found"
         [ "$XFS_DB_PROG" = "" ] && _fatal "xfs_db not found"
         [ "$MKFS_XFS_PROG" = "" ] && _fatal "mkfs_xfs not found"
+        [ "$XFS_INFO_PROG" = "" ] && _fatal "xfs_info not found"
 
         . ./common/xfs
         ;;
@@ -320,7 +321,7 @@ _supports_filetype()
        local fstyp=`$DF_PROG $dir | tail -1 | $AWK_PROG '{print $2}'`
        case "$fstyp" in
        xfs)
-               xfs_info $dir | grep -q "ftype=1"
+               $XFS_INFO_PROG $dir | grep -q "ftype=1"
                ;;
        ext2|ext3|ext4)
                local dev=`$DF_PROG $dir | tail -1 | $AWK_PROG '{print $1}'`

diff --git a/common/xfs b/common/xfs
index 92223513d561c634cf5068afdaea1c3105c46269..5b3fb28cabf035db6e733495c46d3e7e89776728 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -236,7 +236,7 @@ _require_scratch_xfs_crc()
        _scratch_mkfs_xfs >/dev/null 2>&1
        _try_scratch_mount >/dev/null 2>&1 \
           || _notrun "Kernel doesn't support crc feature"
-       xfs_info $SCRATCH_MNT | grep -q 'crc=1' || _notrun "crc feature not supported by this filesystem"
+       $XFS_INFO_PROG $SCRATCH_MNT | grep -q 'crc=1' || _notrun "crc feature not supported by this filesystem"
        _scratch_unmount
 }
 
@@ -477,7 +477,7 @@ _require_xfs_test_rmapbt()
 {
        _require_test
 
-       if [ "$(xfs_info "$TEST_DIR" | grep -c "rmapbt=1")" -ne 1 ]; then
+       if [ "$($XFS_INFO_PROG "$TEST_DIR" | grep -c "rmapbt=1")" -ne 1 ]; then
                _notrun "rmapbt not supported by test filesystem type: $FSTYP"
        fi
 }
@@ -488,7 +488,7 @@ _require_xfs_scratch_rmapbt()
 
        _scratch_mkfs > /dev/null
        _scratch_mount
-       if [ "$(xfs_info "$SCRATCH_MNT" | grep -c "rmapbt=1")" -ne 1 ]; then
+       if [ "$($XFS_INFO_PROG "$SCRATCH_MNT" | grep -c "rmapbt=1")" -ne 1 ]; then
                _scratch_unmount
                _notrun "rmapbt not supported by scratch filesystem type: $FSTYP"
        fi

diff --git a/tests/shared/298 b/tests/shared/298
index 0a11300b9d25449ba61429e0c7ba23180ee43c71..9c8e0966de894d2c8c038c01b99357308c6bf924 100755 (executable)
--- a/tests/shared/298
+++ b/tests/shared/298
@@ -69,7 +69,7 @@ get_free_sectors()
                     }'
        ;;
        xfs)
-       agsize=`xfs_info $loop_mnt | $SED_PROG -n 's/.*agsize=\(.*\) blks.*/\1/p'`
+       agsize=`$XFS_INFO_PROG $loop_mnt | $SED_PROG -n 's/.*agsize=\(.*\) blks.*/\1/p'`
        # Convert free space (agno, block, length) to (start sector, end sector)
        $UMOUNT_PROG $loop_mnt
        $XFS_DB_PROG -r -c "freesp -d" $img_file | $SED_PROG '/^.*from/,$d'| \

diff --git a/tests/xfs/067 b/tests/xfs/067
index 743d94bb3e8a540d79e9ce9196b378258abbf878..4aa8966d7e1fe08449949b3989a41f491d79840a 100755 (executable)
--- a/tests/xfs/067
+++ b/tests/xfs/067
@@ -53,7 +53,7 @@ if [ "$isize" -lt 1024 ]; then
        || _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
 fi
 _scratch_mount
-xfs_info $SCRATCH_MNT >>$seqres.full
+$XFS_INFO_PROG $SCRATCH_MNT >>$seqres.full
 cd $SCRATCH_MNT
 
 echo ""

diff --git a/tests/xfs/073 b/tests/xfs/073
index 9bcc95ddece942305beaafceea13158ee9d4d001..c1870be22ae15dfcde9082fc6a4e7e37a3995c82 100755 (executable)
--- a/tests/xfs/073
+++ b/tests/xfs/073
@@ -107,11 +107,11 @@ _verify_copy()
        diff -u $tmp.manifest1 $tmp.manifest2
 
        echo comparing new image geometry to old
-       xfs_info $source_dir \
+       $XFS_INFO_PROG $source_dir \
                | _filter_copy $source $source_dir '/dev/loop.' '#' \
                | tr -s ' ' \
                > $tmp.geometry1
-       xfs_info $target_dir \
+       $XFS_INFO_PROG $target_dir \
                | _filter_copy $target $target_dir '/dev/loop.' '#' \
                | tr -s ' ' \
                > $tmp.geometry2

diff --git a/tests/xfs/085 b/tests/xfs/085
index 57fc47c91d80c40cd070f8c497ffae6b962b1035..8f932292f164f72b271c727ab93a8b6818419994 100755 (executable)
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -78,7 +78,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/086 b/tests/xfs/086
index 98b45dde00b3f9642e0df99d90c9aa8e32575c2d..d05b06190acc62d6418c5ef1d815319eebc0f17a 100755 (executable)
--- a/tests/xfs/086
+++ b/tests/xfs/086
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 test "${agcount}" -gt 1 || _notrun "Single-AG XFS not supported"
 umount "${SCRATCH_MNT}"
 

diff --git a/tests/xfs/087 b/tests/xfs/087
index 65877c7c4ed2330962c3f9c1e1349e1d21a73d70..4549597c251d3c3bbe7e382f938b672240305060 100755 (executable)
--- a/tests/xfs/087
+++ b/tests/xfs/087
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/088 b/tests/xfs/088
index 14b1f115b7c933458bc3359efd59844171ee9be0..f46c1ead2e69ee0c5e546cdead9809e8c4317f48 100755 (executable)
--- a/tests/xfs/088
+++ b/tests/xfs/088
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/089 b/tests/xfs/089
index e47f7fefc77a026f332fee5e5a12a2c0fb3db658..5b8086046ebf9afba91e36bab3bf5997037fe980 100755 (executable)
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/091 b/tests/xfs/091
index 7adbdc9efb4264b2e94c07bef130bdf99f2b7eb4..5e50e8a8ff1c743a37a101352a4de56554980a02 100755 (executable)
--- a/tests/xfs/091
+++ b/tests/xfs/091
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/093 b/tests/xfs/093
index 440cdb6602d4ec0617d51922c0451cdec9dc4f6c..aa9c360bf8e60a34621cad7be6a170b221f0797f 100755 (executable)
--- a/tests/xfs/093
+++ b/tests/xfs/093
@@ -79,7 +79,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/097 b/tests/xfs/097
index 703bd9b49036434a088f65e3dcca99dbb995cdee..56104ee3e18140baee16cb43449d0977303ae316 100755 (executable)
--- a/tests/xfs/097
+++ b/tests/xfs/097
@@ -65,7 +65,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-xfs_info "${SCRATCH_MNT}" | grep -q "finobt=1" || _notrun "finobt not enabled"
+$XFS_INFO_PROG "${SCRATCH_MNT}" | grep -q "finobt=1" || _notrun "finobt not enabled"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 
 echo "+ make some files"
@@ -82,7 +82,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"

diff --git a/tests/xfs/099 b/tests/xfs/099
index 2d63536c540061f00bcbb2ec351ba7a4013d36c0..d9aad7e331e57a23b718e27df34007e01d712169 100755 (executable)
--- a/tests/xfs/099
+++ b/tests/xfs/099
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((dblksz / 40))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/100 b/tests/xfs/100
index 83146ee07ca2539c451ddfd01ba6159a73bdc4f5..1e76fc4562e857c5861ded3902ae206ab3a71f70 100755 (executable)
--- a/tests/xfs/100
+++ b/tests/xfs/100
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((dblksz / 12))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/101 b/tests/xfs/101
index 426c3e9ca3c7b865a46f95cf88e610928d6cf7a9..0e5ed60486bb06706aa69949002b42dd515bc11c 100755 (executable)
--- a/tests/xfs/101
+++ b/tests/xfs/101
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((dblksz / 12))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/102 b/tests/xfs/102
index 02bc35ca01569658419c6029fe6b245e576144a4..ec55c3a622424b8488fa36213817758540ae201c 100755 (executable)
--- a/tests/xfs/102
+++ b/tests/xfs/102
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((16 * dblksz / 40))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/105 b/tests/xfs/105
index c3a853b003e5f97284bbc1c7d8c98b5025066a4e..bac6e282d523ede9ab7c94ab5fdb7a84a373203d 100755 (executable)
--- a/tests/xfs/105
+++ b/tests/xfs/105
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((16 * dblksz / 40))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/112 b/tests/xfs/112
index cec3a168246e1e50ec63ae20736ef2bc5be63159..fc2ee95da9082d5d752dd0257ef1f21e313c22f3 100755 (executable)
--- a/tests/xfs/112
+++ b/tests/xfs/112
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((16 * dblksz / 40))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/113 b/tests/xfs/113
index 17af3b667bc5b461bd126df00fa74215f3c0e63e..b19d948d534d013a850ab0d1533cde307894dcf4 100755 (executable)
--- a/tests/xfs/113
+++ b/tests/xfs/113
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs > /dev/null
 
 echo "+ mount fs image"
 _scratch_mount
-dblksz="$(xfs_info "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
 nr="$((128 * dblksz / 40))"
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
 leaf_lblk="$((32 * 1073741824 / blksz))"

diff --git a/tests/xfs/127 b/tests/xfs/127
index 60597fbf8f67d3da9730f74981ef4634ac3c7f43..863581dfabfea9c2bf87060a682f9367d1badb99 100755 (executable)
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -68,7 +68,7 @@ _scratch_cycle_mount
 echo "Create more reflink copies"
 _cp_reflink $testdir/original $testdir/copy3
 
-xfs_info $SCRATCH_MNT >> $seqres.full
+$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full
 
 # success, all done
 status=0

diff --git a/tests/xfs/130 b/tests/xfs/130
index a9e0ff4853d90d48eaabe96527c06251239f6bd3..71df9bbd2a88ec648eac8ecd610d13892ebb9676 100755 (executable)
--- a/tests/xfs/130
+++ b/tests/xfs/130
@@ -58,7 +58,7 @@ _scratch_mkfs_xfs > /dev/null
 echo "+ mount fs image"
 _scratch_mount
 blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
-agcount="$(xfs_info "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
 
 echo "+ make some files"
 _pwrite_byte 0x62 0 $((blksz * 64)) "${SCRATCH_MNT}/file0" >> "$seqres.full"

diff --git a/tests/xfs/190 b/tests/xfs/190
index d68821627546e1602fcce457a1c1ac322df725e1..251b72834093d0a7121827ef6a6659e1c8ffaa02 100755 (executable)
--- a/tests/xfs/190
+++ b/tests/xfs/190
@@ -54,7 +54,7 @@ _supported_os Linux
 _require_scratch
 _scratch_mkfs_xfs >/dev/null 2>&1
 _scratch_mount
-fsblocksize=`xfs_info $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'`
+fsblocksize=`$XFS_INFO_PROG $SCRATCH_MNT|sed 's/=/ /g'|awk '/^data / { print $3 }'`
 
 dd if=/dev/zero of=$SCRATCH_MNT/$filename bs=1024k count=10 >> $seqres.full 2>&1
 

diff --git a/tests/xfs/206 b/tests/xfs/206
index d5edf1ae1653962a4d91daee1e0307392904f429..91467e90d45185d0367b065a20ffb219c51b99ca 100755 (executable)
--- a/tests/xfs/206
+++ b/tests/xfs/206
@@ -104,7 +104,7 @@ xfs_growfs $tmpdir  | mkfs_filter
 
 # and double-check the new geometry
 echo "=== xfs_info ==="
-xfs_info $tmpdir | mkfs_filter
+$XFS_INFO_PROG $tmpdir | mkfs_filter
 
 # _cleanup cleans up for us
 

diff --git a/tests/xfs/233 b/tests/xfs/233
index b20dd4f117f88344ef96c079e88f98ca5a576ff3..9e7d3b325665f18e7431a07115369ef6073733f3 100755 (executable)
--- a/tests/xfs/233
+++ b/tests/xfs/233
@@ -66,7 +66,7 @@ _scratch_cycle_mount
 echo "Create more copies"
 cp -p $testdir/original $testdir/copy3
 
-xfs_info $SCRATCH_MNT >> $seqres.full
+$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full
 
 # success, all done
 status=0

diff --git a/tests/xfs/235 b/tests/xfs/235
index 84725b0af31444193ce0d28ff9d3e674c9d5dd8f..f7d75e78baaaab3f7feb88121a93109598418d41 100755 (executable)
--- a/tests/xfs/235
+++ b/tests/xfs/235
@@ -56,7 +56,7 @@ _scratch_mkfs_xfs > /dev/null
 echo "+ mount fs image"
 _scratch_mount
 blksz=$(stat -f -c '%s' ${SCRATCH_MNT})
-agcount=$(xfs_info ${SCRATCH_MNT} | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')
+agcount=$($XFS_INFO_PROG ${SCRATCH_MNT} | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')
 
 echo "+ make some files"
 _pwrite_byte 0x62 0 $((blksz * 64)) ${SCRATCH_MNT}/file0 >> $seqres.full

diff --git a/tests/xfs/271 b/tests/xfs/271
index 156cfae62832f85a87a321bae30ef28f9a0f4614..d82b19b7df8abe619bae7346d099257021e55f06 100755 (executable)
--- a/tests/xfs/271
+++ b/tests/xfs/271
@@ -51,7 +51,7 @@ echo "Format and mount"
 _scratch_mkfs > "$seqres.full" 2>&1
 _scratch_mount
 
-agcount=$(xfs_info $SCRATCH_MNT | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')
+agcount=$($XFS_INFO_PROG $SCRATCH_MNT | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')
 
 echo "Get fsmap" | tee -a $seqres.full
 $XFS_IO_PROG -c 'fsmap -v' $SCRATCH_MNT > $TEST_DIR/fsmap

diff --git a/tests/xfs/307 b/tests/xfs/307
index d8295245232c8b04ef85c2503ea1668688c983f1..4d88fccd03f8173cefead98a46fe0189283708cb 100755 (executable)
--- a/tests/xfs/307
+++ b/tests/xfs/307
@@ -52,7 +52,7 @@ rm -f $seqres.full
 echo "Format"
 _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full
-is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1")
+is_rmap=$($XFS_INFO_PROG $SCRATCH_MNT | grep -c "rmapbt=1")
 _scratch_unmount
 
 _get_agf_data() {

diff --git a/tests/xfs/308 b/tests/xfs/308
index 7e7adac36d3fd38d9b59d448b70507e451f93997..3d346ec6ff2cb9f95bfb51784456c370f40437f2 100755 (executable)
--- a/tests/xfs/308
+++ b/tests/xfs/308
@@ -52,7 +52,7 @@ rm -f $seqres.full
 echo "Format"
 _scratch_mkfs > $seqres.full 2>&1
 _scratch_mount >> $seqres.full
-is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1")
+is_rmap=$($XFS_INFO_PROG $SCRATCH_MNT | grep -c "rmapbt=1")
 _scratch_unmount
 
 _get_agf_data() {

diff --git a/tests/xfs/310 b/tests/xfs/310
index f7b7e30e3a061cd8dd81483e0b8d2c4e8b194c62..f655693d25d6e969ab745760faf68a5333be1194 100755 (executable)
--- a/tests/xfs/310
+++ b/tests/xfs/310
@@ -67,7 +67,7 @@ sectors=$(( (nr_blks * 3) * blksz / 512 )) # each AG must have > 2^21 blocks
 _dmhugedisk_init $sectors
 _mkfs_dev -d agcount=2 $DMHUGEDISK_DEV
 _mount $DMHUGEDISK_DEV $SCRATCH_MNT
-xfs_info $SCRATCH_MNT >> $seqres.full
+$XFS_INFO_PROG $SCRATCH_MNT >> $seqres.full
 
 echo "Create the original file blocks"
 mkdir $testdir

diff --git a/tests/xfs/348 b/tests/xfs/348
index 9d3bcb222b8f60048e087d88074a848c98ad9b19..4702629eb923d46123f966773ac2d31bcce191f1 100755 (executable)
--- a/tests/xfs/348
+++ b/tests/xfs/348
@@ -70,7 +70,7 @@ mknod $testdir/CHRDEV c 1 1
 mknod $testdir/BLKDEV b 1 1
 mknod $testdir/FIFO p
 
-xfs_info $SCRATCH_MNT | grep -q "ftype=1" && FTYPE_FEATURE=1
+$XFS_INFO_PROG $SCRATCH_MNT | grep -q "ftype=1" && FTYPE_FEATURE=1
 
 # Record test dir inode for xfs_repair filter
 inode_filter=$tmp.sed