From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Make the xfs_scrub output that gets recorded to $seqres.full follow the format of xfs_repair checks. Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --- common/xfs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/xfs b/common/xfs index de3c560..5643adf 100644 --- a/common/xfs +++ b/common/xfs @@ -357,11 +357,15 @@ _check_xfs_filesystem() # Run online scrub if we can. mntpt="$(_is_mounted $device)" if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then - "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full 2>&1 + "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1 if [ $? -ne 0 ]; then - _log_err "filesystem on $device failed scrub" + _log_err "_check_xfs_filesystem: filesystem on $device failed scrub" + echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full + cat $tmp.scrub >> $seqres.full + echo "*** end xfs_scrub output" >> $serqres.full ok=0 fi + rm -f $tmp.scrub fi if [ "$type" = "xfs" ]; then -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
