From: Ojaswin Mujoo Date: Mon, 16 May 2022 08:45:05 +0000 (+0530) Subject: common/rc: Modify _require_batched_discard to improve test coverage X-Git-Tag: v2022.05.22~16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee264b3fa67646e4724685be3250e8a24f30f36a;p=users%2Fhch%2Fxfstests-dev.git common/rc: Modify _require_batched_discard to improve test coverage A recent ext4 patch discussed [1] that some devices (eg LVMs) can have a discard granularity as big as 42MB which makes it larger than the group size of ext4 FS with 1k BS. This causes the FITRIM IOCTL to fail. This case was not correctly handled by this test since "_require_batched_discard" incorrectly interpreted the FITRIM failure as SCRATCH_DEV not supporting the IOCTL. This caused the test to report "not run" instead of "failed" in case of large discard granularity. Fix "_require_batched_discard" to use a more accurate method to determine if discard is supported. [1] commit 173b6e383d2 ext4: avoid trim error on fs with small groups Signed-off-by: Ojaswin Mujoo Reviewed-by: Ritesh Harjani Signed-off-by: Zorro Lang --- diff --git a/common/rc b/common/rc index 4201a0593..48ac488da 100644 --- a/common/rc +++ b/common/rc @@ -4007,7 +4007,12 @@ _require_batched_discard() exit 1 fi _require_fstrim - $FSTRIM_PROG $1 > /dev/null 2>&1 || _notrun "FITRIM not supported on $1" + + grep -q "not supported" <($FSTRIM_PROG $1 2>&1) + if [ "$?" = "0" ] + then + _notrun "FITRIM not supported on $1" + fi } _require_dumpe2fs()