From: Darrick J. Wong <djwong@kernel.org>
Date: Thu, 20 Feb 2025 21:47:12 +0000 (-0800)
Subject: xfs/291: use _scratch_mkfs_sized instead of opencoding the logic
X-Git-Tag: v2025.03.09~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=260efb67e86b2f580360829ef53979299cbb8a20;p=xfstests-dev.git

xfs/291: use _scratch_mkfs_sized instead of opencoding the logic

Now that _scratch_mkfs_xfs_sized accepts arbitrary mkfs arguments, this
test doesn't need to open-code the helper just to add the dir block and
log size arguments.  Clean this up, which will also help us to avoid
problems with rtrmap if the rt devices is large enough to cause format
failures with the 133M data device size.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/xfs/291 b/tests/xfs/291
index 777968a9..1a8cda4e 100755
--- a/tests/xfs/291
+++ b/tests/xfs/291
@@ -26,7 +26,7 @@ _xfs_setup_verify_metadump
 
 _require_scratch
 logblks=$(_scratch_find_xfs_min_logblocks -n size=16k -d size=133m)
-_scratch_mkfs_xfs -n size=16k -l size=${logblks}b -d size=133m >> $seqres.full 2>&1
+_scratch_mkfs_sized $((133 * 1048576)) '' -n size=16k -l size=${logblks}b >> $seqres.full 2>&1
 _scratch_mount
 
 # First we cause very badly fragmented freespace, then