[PATCH 1/2] common/xfs: fix _scratch_mkfs_xfs_supports_concurrency
"Darrick J. Wong" <[email protected]>
| Newsgroups | org.kernel.vger.fstests,org.kernel.vger.linux-xfs |
|---|---|
| Message-ID | <20260520185202.GD9544@frogsfrogsfrogs> |
From: Darrick J. Wong <[email protected]> generic/347 regresses when external logs are in the configuration: --- a/generic/347.out 2025-07-15 14:45:15.044714644 -0700 +++ b/generic/347.out.bad 2026-05-18 23:17:01.687750781 -0700 @@ -1,2 +1,36 @@ QA output created by 347 -=== completed +Cannot specify both -l logdev and -l concurrency +Usage: mkfs.xfs Since this actually tests running mkfs.xfs with $SCRATCH_OPTIONS, the helper ought to have detected that you can't give both. Unfortunately, there's a weird switch that turns -l into -d even though they're not quite the same option. Delete that, and fix the indentation (tabs, not spaces) in the helper. Cc: <[email protected]> # v2026.05.17 Fixes: 7f162f5bcf50fc ("common/xfs: helper function to check if -l/-d/-r concurrecy flags.") Signed-off-by: "Darrick J. Wong" <[email protected]> --- common/xfs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/xfs b/common/xfs index 4b3a7f7d153282..88299acdd086be 100644 --- a/common/xfs +++ b/common/xfs @@ -2431,8 +2431,7 @@ _require_xfs_healer() # -l/-d concurrency came in same xfsprogs release v6.7 _scratch_mkfs_xfs_supports_concurrency() { - local arg="${1:-d}" + local arg="${1:-d}" - test "$arg" = "-l" && arg="-d" - _scratch_mkfs_xfs_supported "$arg" concurrency=0 + _scratch_mkfs_xfs_supported "$arg" concurrency=0 }