apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: Use _require_btrfs_qgroup_report to replace open code

Browse Source 
Introduce new _require_btrfs_qgroup_report function, which will
check the accessibility to "btrfs check --qgroup-report", then set a
global flag to info _check_scratch_fs() to do extra qgroup check.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Qu Wenruo
2016-12-09 09:19:59 +08:00
committed by Eryu Guan
parent 47bb69de19
commit 180843c1f4
11 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/btrfs
+21 -1
View File
@@ -41,6 +41,13 @@ _require_btrfs_command()
[ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd $param)"
}
# Require extra check on btrfs qgroup numbers
_require_btrfs_qgroup_report()
{
_require_btrfs_command check --qgroup-report
touch ${RESULT_DIR}/require_scratch.require_qgroup_report
}
_run_btrfs_util_prog()
{
run_check $BTRFS_UTIL_PROG $*
@@ -98,7 +105,20 @@ _check_btrfs_filesystem()
mountpoint=`_umount_or_remount_ro $device`
fi
btrfsck $device >$tmp.fsck 2>&1
if [ -f ${RESULT_DIR}/require_scratch.require_qgroup_report ]; then
$BTRFS_UTIL_PROG check $device --qgroup-report > $tmp.qgroup_report 2>&1
if grep -qE "Counts for qgroup.*are different" $tmp.qgroup_report ; then
echo "_check_btrfs_filesystem: filesystem on $device has wrong qgroup numbers (see $seqres.full)"
echo "_check_btrfs_filesystem: filesystem on $device has wrong qgroup numbers" \
>> $seqres.full
echo "*** qgroup_report.$FSTYP output ***" >>$seqres.full
cat $tmp.qgroup_report >>$seqres.full
echo "*** qgroup_report.$FSTYP output ***" >>$seqres.full
fi
rm -f $tmp.qgroup_report
fi
$BTRFS_UTIL_PROG check $device >$tmp.fsck 2>&1
if [ $? -ne 0 ]; then
echo "_check_btrfs_filesystem: filesystem on $device is inconsistent (see $seqres.full)"