common/xfs: refactor agcount calculation for mounted filesystems

[xfstests-dev.git] / tests / xfs / 085

diff --git a/tests/xfs/085 b/tests/xfs/085
index 735277961e2094a30d591161509c1521ef7aad45..18ddeff8e56a559d93a6043fb7c744640e4c9e61 100755 (executable)
--- a/tests/xfs/085
+++ b/tests/xfs/085
@@ -1,27 +1,12 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Oracle, Inc.  All Rights Reserved.
+#
 # FS QA Test No. 085
 #
 # Create and populate an XFS filesystem, corrupt a superblock, then see how
 # the kernel and xfs_repair deal with it.
 #
-#-----------------------------------------------------------------------
-# Copyright (c) 2015 Oracle, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -50,6 +35,7 @@ _supported_os Linux
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
 _require_attrs
+_require_populate_commands
 _require_xfs_db_blocktrash_z_command
 
 rm -f $seqres.full
@@ -77,7 +63,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_mount_agcount $SCRATCH_MNT)"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"
@@ -87,7 +73,7 @@ echo "+ corrupt image"
 $XFS_IO_PROG -f -c "pwrite -S 0x62 32 4" "${SCRATCH_DEV}" >> $seqres.full
 
 echo "+ mount image"
-_scratch_mount 2>/dev/null && _fail "mount should not succeed"
+_try_scratch_mount 2>/dev/null && _fail "mount should not succeed"
 
 echo "+ repair fs"
 _scratch_xfs_repair >> $seqres.full 2>&1
@@ -96,7 +82,7 @@ echo "+ mount image (2)"
 _scratch_mount
 
 echo "+ chattr -R -i"
-chattr -R -f -i "${SCRATCH_MNT}/"
+$CHATTR_PROG -R -f -i "${SCRATCH_MNT}/"
 
 echo "+ modify files (2)"
 broken=0