From: David Sterba <dsterba@suse.com>
To: kdevops@lists.linux.dev
Cc: David Sterba <dsterba@suse.com>
Subject: [PATCH] btrfs: remove discard=async from mount options
Date: Thu, 24 Apr 2025 19:25:31 +0200 [thread overview]
Message-ID: <20250424172531.3405647-1-dsterba@suse.com> (raw)
The option has been default since 6.2, no need to set it.
Signed-off-by: David Sterba <dsterba@suse.com>
---
.../fstests/templates/btrfs/btrfs.config | 52 +++++++++----------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/playbooks/roles/fstests/templates/btrfs/btrfs.config b/playbooks/roles/fstests/templates/btrfs/btrfs.config
index b3a07612edc00b..8fa9801c646d79 100644
--- a/playbooks/roles/fstests/templates/btrfs/btrfs.config
+++ b/playbooks/roles/fstests/templates/btrfs/btrfs.config
@@ -13,8 +13,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O ^no-holes -R ^free-space-tree'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o discard=async"
-TEST_FS_MOUNT_OPTS="-o discard=async"
+MOUNT_OPTIONS=""
+TEST_FS_MOUNT_OPTS=""
PERF_CONFIGNAME={{ fstests_perf_config }}
{% endif %}
@@ -23,8 +23,8 @@ PERF_CONFIGNAME={{ fstests_perf_config }}
TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=zlib,discard=async""
-TEST_FS_MOUNT_OPTS="-o compress=zlib,discard=async""
+MOUNT_OPTIONS="-o compress=zlib"
+TEST_FS_MOUNT_OPTS="-o compress=zlib"
{% endif %}
{% if fstests_btrfs_section_holes_lzo -%}
@@ -32,8 +32,8 @@ TEST_FS_MOUNT_OPTS="-o compress=zlib,discard=async""
TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=lzo,discard=async""
-TEST_FS_MOUNT_OPTS="-o compress=lzo,discard=async""
+MOUNT_OPTIONS="-o compress=lzo"
+TEST_FS_MOUNT_OPTS="-o compress=lzo"
{% endif %}
{% if fstests_btrfs_section_holes_zstd -%}
@@ -41,8 +41,8 @@ TEST_FS_MOUNT_OPTS="-o compress=lzo,discard=async""
TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=zstd,discard=async"
-TEST_FS_MOUNT_OPTS="-o compress=zstd,discard=async"
+MOUNT_OPTIONS="-o compress=zstd"
+TEST_FS_MOUNT_OPTS="-o compress=zstd"
{% endif %}
{% if fstests_btrfs_section_noholes -%}
@@ -60,8 +60,8 @@ TEST_DEV={{ fstests_test_dev }}
LOGWRITES_DEV={{ fstests_logwrites_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=zlib,discard=async"
-TEST_FS_MOUNT_OPTS="-o compress=zlib,discard=async"
+MOUNT_OPTIONS="-o compress=zlib"
+TEST_FS_MOUNT_OPTS="-o compress=zlib"
{% endif %}
{% if fstests_btrfs_section_noholes_lzo -%}
@@ -70,8 +70,8 @@ TEST_DEV={{ fstests_test_dev }}
LOGWRITES_DEV={{ fstests_logwrites_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=lzo,discard=async"
-TEST_FS_MOUNT_OPTS="-o compress=lzo,discard=async"
+MOUNT_OPTIONS="-o compress=lzo"
+TEST_FS_MOUNT_OPTS="-o compress=lzo"
{% endif %}
{% if fstests_btrfs_section_noholes_zstd -%}
@@ -80,8 +80,8 @@ TEST_DEV={{ fstests_test_dev }}
LOGWRITES_DEV={{ fstests_logwrites_dev }}
MKFS_OPTIONS='-f -K -O no-holes -f -R ^free-space-tree'
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o compress=zstd,discard=async"
-TEST_FS_MOUNT_OPTS="-o compress=zstd,discard=async"
+MOUNT_OPTIONS="-o compress=zstd"
+TEST_FS_MOUNT_OPTS="-o compress=zstd"
{% endif %}
{% if fstests_btrfs_section_fspace -%}
@@ -110,8 +110,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O ^no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=zlib,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zlib,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=zlib"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zlib"
{% endif %}
{% if fstests_btrfs_section_fspace_lzo -%}
@@ -120,8 +120,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O ^no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=lzo,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=lzo,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=lzo"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=lzo"
{% endif %}
{% if fstests_btrfs_section_fspace_zstd -%}
@@ -130,8 +130,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O ^no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=zstd,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zstd,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=zstd"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zstd"
{% endif %}
{% if fstests_btrfs_section_nohofspace -%}
@@ -151,8 +151,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=zlib,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zlib,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=zlib"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zlib"
{% endif %}
{% if fstests_btrfs_section_nohofspace_lzo -%}
@@ -161,8 +161,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=lzo,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=lzo,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=lzo"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=lzo"
{% endif %}
{% if fstests_btrfs_section_nohofspace_zstd -%}
@@ -171,8 +171,8 @@ TEST_DEV={{ fstests_test_dev }}
MKFS_OPTIONS='-f -K -O no-holes'
LOGWRITES_DEV={{ fstests_logwrites_dev }}
SCRATCH_DEV_POOL="{{ fstests_scratch_devpool }}"
-MOUNT_OPTIONS="-o space_cache=v2 -o compress=zstd,discard=async"
-TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zstd,discard=async"
+MOUNT_OPTIONS="-o space_cache=v2 -o compress=zstd"
+TEST_FS_MOUNT_OPTS="-o space_cache=v2 o compress=zstd"
{% endif %}
{% if fstests_btrfs_section_simple -%}
--
2.49.0
next reply other threads:[~2025-04-24 17:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-24 17:25 David Sterba [this message]
2025-04-24 17:56 ` [PATCH] btrfs: remove discard=async from mount options Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250424172531.3405647-1-dsterba@suse.com \
--to=dsterba@suse.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox