From: Qu Wenruo <wqu@suse.com>
Date: Mon, 19 May 2025 05:28:39 +0000 (+0930)
Subject: fstests: generic/537: remove the btrfs specific mount option
X-Git-Tag: v2025.05.25~16
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f405f5f6cc8e5c33e11f8bb0b0256d1753720d2f;p=xfstests-dev.git

fstests: generic/537: remove the btrfs specific mount option

Although btrfs deprecated "norecovery" mount option in upstream kernel
commit a1912f712188 ("btrfs: remove code for inode_cache and recovery
mount options"), later "norecovery" mount option is re-introduced for
compatibility by commit 440861b1a03c ("btrfs: re-introduce 'norecovery'
mount option").

Instead the btrfs specific mount option "nologreplay" is already
deprecated for a long time and is going to be removed soon.

So use the generic "norecovery" for all filesystems.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/generic/537 b/tests/generic/537
index 3be743c4..77d38bbf 100755
--- a/tests/generic/537
+++ b/tests/generic/537
@@ -55,7 +55,6 @@ fi
 
 echo "fstrim on ro mount with no log replay"
 norecovery="norecovery"
-test $FSTYP = "btrfs" && norecovery=nologreplay
 _scratch_mount -o ro,$norecovery >> $seqres.full 2>&1
 $FSTRIM_PROG -v $SCRATCH_MNT >> $seqres.full 2>&1 && \
 	echo "fstrim with unrecovered metadata just ate your filesystem"