From: Boris Ranto Date: Wed, 30 May 2012 22:39:29 +0000 (-0500) Subject: 016: Do not discard blocks at mkfs time X-Git-Tag: v2022.05.01~3593^2~4 X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=b748511b813ea55b2bf44410c012618b7c1c7bf0 016: Do not discard blocks at mkfs time The test 016 fills scratch device with some data and then creates xfs fs on the scratch device. Later, the test assumes that the previously written data are still written there and checks for them at specific locations. On ssd drive this will lead to a failure since the blocks are discarded by default when the mkfs command is run. This is a more verbose version of the previous patch. This simple patch that adds -K to stop the discarding (if the mkfs command supports it) fixed the issue for me: Signed-off-by: Boris Ranto Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/016 b/016 index 9275ade5..08a73f49 100755 --- a/016 +++ b/016 @@ -65,6 +65,15 @@ _init() $here/src/devzero -b 2048 -n 50 -v 198 $SCRATCH_DEV echo "*** mkfs" force_opts="-dsize=50m -lsize=$log_size" + # + # Do not discard blocks as we check for patterns in free space. + # + # First, make sure that mkfs supports '-K' option by using its + # dry run (-N option) and then add it to the force_opts. + # + if _scratch_mkfs_xfs -N -K $force_opts >/dev/null 2>&1; then + force_opts="-K $force_opts" + fi echo mkfs_xfs $force_opts $SCRATCH_DEV >>$seq.full _scratch_mkfs_xfs $force_opts >$tmp.mkfs0 2>&1 [ $? -ne 0 ] && \