On Mon, Jun 09, 2025 at 11:03:54AM +0000, Hans Holmberg wrote:
> xfs supports separate log devices and as this test now passes, share
> it by turning it into a generic test.
>
> This should not result in a new failure for other file systems as only
> ext2/ext3/ext4 and xfs supports mkfs with SCRATCH_LOGDEVs.
>
> Signed-off-by: Hans Holmberg <hans.holmberg@xxxxxxx>
Looks ok,
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> tests/{ext4/002 => generic/766} | 11 ++++++++++-
> tests/{ext4/002.out => generic/766.out} | 2 +-
> 2 files changed, 11 insertions(+), 2 deletions(-)
> rename tests/{ext4/002 => generic/766} (91%)
> rename tests/{ext4/002.out => generic/766.out} (98%)
>
> diff --git a/tests/ext4/002 b/tests/generic/766
> similarity index 91%
> rename from tests/ext4/002
> rename to tests/generic/766
> index 6c1e1d926973..3b6911f0bdb9 100755
> --- a/tests/ext4/002
> +++ b/tests/generic/766
> @@ -3,10 +3,11 @@
> # Copyright (c) 2009 Christoph Hellwig.
> # Copyright (c) 2020 Lukas Czerner.
> #
> -# FS QA Test No. 002
> +# FS QA Test No. 766
> #
> # Copied from tests generic/050 and adjusted to support testing
> # read-only external journal device on ext4.
> +# Moved to generic from ext4/002 to support xfs as well
> #
> # Check out various mount/remount/unmount scenarious on a read-only
> # logdev blockdev.
> @@ -31,6 +32,14 @@ _cleanup()
>
> _exclude_fs ext2
>
> +[ $FSTYP == "ext4" ] && \
> + _fixed_by_kernel_commit 273108fa5015 \
> + "ext4: handle read only external journal device"
> +
> +[ $FSTYP == "xfs" ] && \
> + _fixed_by_kernel_commit bfecc4091e07 \
> + "xfs: allow ro mounts if rtdev or logdev are read-only"
> +
> _require_scratch_nocheck
> _require_scratch_shutdown
> _require_logdev
> diff --git a/tests/ext4/002.out b/tests/generic/766.out
> similarity index 98%
> rename from tests/ext4/002.out
> rename to tests/generic/766.out
> index 579bc7e0cd78..975751751749 100644
> --- a/tests/ext4/002.out
> +++ b/tests/generic/766.out
> @@ -1,4 +1,4 @@
> -QA output created by 002
> +QA output created by 766
> setting log device read-only
> mounting with read-only log device:
> mount: device write-protected, mounting read-only
> --
> 2.34.1
>
