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

common: fix _count_extents and _count_holes

Browse Source 
In _count_extents and _count_holes, the output of 'xfs_io -c "fiemap"'
is saved in var res, but the following "echo $res" will merge the
original output into one line. e.g.

	0: [0..63]: 96..159
	1: [64..127]: hole

will be

	0: [0..63]: 96..159 1: [64..127]: hole

so the extent count is always 0 if there's a hole.

This makes generic/046 fail occasionally. (Seems it's easier to
reproduce when the system is under some presure, e.g. with fsstress
running.)

Tested the new _count_extents and _count_holes with generic/04[3-9] and
tests all passed as expect.

Reported-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Eryu Guan
2015-08-04 14:10:49 +10:00
committed by Dave Chinner
parent dca33a6009
commit 5da2519817
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/rc
+2 -4
View File
@@ -2447,14 +2447,12 @@ _require_fiemap()
_count_extents()
{
res=`$XFS_IO_PROG -c "fiemap" $1 | tail -n +2`
echo $res | grep -v hole | wc -l | $AWK_PROG '{print $1}'
$XFS_IO_PROG -c "fiemap" $1 | tail -n +2 | grep -v hole | wc -l
}
_count_holes()
{
res=`$XFS_IO_PROG -c "fiemap" $1 | tail -n +2`
echo $res | grep hole | wc -l | $AWK_PROG '{print $1}'
$XFS_IO_PROG -c "fiemap" $1 | tail -n +2 | grep hole | wc -l
}
# arg 1 is dev to remove and is output of the below eg.