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 <[email protected]>
Signed-off-by: Eryu Guan <[email protected]>
---
common/rc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/common/rc b/common/rc
index 15e7795..0d3570f 100644
--- a/common/rc
+++ b/common/rc
@@ -2434,14 +2434,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.
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
