btrfs: remove discard=async from mount options

The option has been default since 6.2, no need to set it.

Signed-off-by: David Sterba <dsterba@suse.com>

Author: kdave

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,26 +23,26 @@ 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 -%}
 [btrfs_holes_lzo]
 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 -%}
 [btrfs_holes_zstd]
 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 -%}