generic/530: only use xfs-specific mkfs options when testing on xfs

This fixes a regression introduced by commit 000813899afb ("fstests:
scale some tests for high CPU count sanity") where this test
unconditionally tried to use the mkfs option "-l size=256m" which
would break when testing any file sytem other than xfs.

Fix this the same way commit 000813899afb dealt with this for
generic/531; so this was just an oversight.

Fixes: 000813899afb ("fstests: scale some tests for high CPU count sanity")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/530 b/tests/generic/530
index 18256b870b53696cfba5facc1da8d69182c84026..f2513156a920e8c8514b70f364d19b276784d3c3 100755 (executable)
--- a/tests/generic/530
+++ b/tests/generic/530
@@ -22,7 +22,14 @@ _require_scratch_shutdown
 _require_metadata_journaling
 _require_test_program "t_open_tmpfiles"
 
-_scratch_mkfs "-l size=256m" >> $seqres.full 2>&1
+# For XFS, pushing 50000 unlinked inode inactivations through a small xfs log
+# can result in bottlenecks on the log grant heads, so try to make the log
+# larger to reduce runtime.
+if [ "$FSTYP" = "xfs" ] && ! _has_logdev; then
+    _scratch_mkfs "-l size=256m" >> $seqres.full 2>&1
+else
+    _scratch_mkfs >> $seqres.full 2>&1
+fi
 _scratch_mount
 
 # Set ULIMIT_NOFILE to min(file-max / 2, 50000 files per LOAD_FACTOR)