From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E0F2288CA5 for ; Thu, 24 Apr 2025 17:25:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745515547; cv=none; b=BospTHRdecvbn6OZBGOhGrxoL3nbCpapERWZvoO6ATwbSeWXrH6OB6nZ4RWVTyMXH3d4ABkEjIZgEQj2dVGifwbsA3B/neYcQFP8fSmHzi3QPbEug1f3IS1UJyyC0G7QLe4sX23/IO2QX55gnDVo+s4u9SNwXWGids7jE/rSFsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745515547; c=relaxed/simple; bh=JJVu8sTvxUQZsIyZ539HH82JfkhibeSL8PotDcQgTQM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=K6d0TldIc/iKdNR37CXEf3of2Y8VjpM7yfxC0aSVhteNZKKgg02ofAyAhxMo3gNn+a4Fm9fZG3zN+n0PxHiSep4sW+iP4olt/zTE9GsIhE56Yd8vjt0ZMBhY9KeJ5by9aytMUcm5rUGVFaS0njaNuVqAy0oGYAn6ZS0HsA2fuuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=qMUqVpmE; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=FhvO4vcz; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="qMUqVpmE"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="FhvO4vcz" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E988A21179; Thu, 24 Apr 2025 17:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1745515537; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yk44zrjxmzJINz0yHW0OwcT3s3Y5rsSfkAmnmK/fZlA=; b=qMUqVpmEnpQfpbM0OJgEuitZGv7/s1afWcbzUW727rpBiRnQ9tbntdBkMH6QQkgqCYga6E AvJ4cnp1Yp0ko8ajjYEeJG5gLhs3eFDOaoj1qJL0OCuNpVPTDBsfi0ba1eg27Haqad7SFG VQu3OuVfTSfCUeBybk1NVpN3k3HvWpU= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=FhvO4vcz DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1745515536; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yk44zrjxmzJINz0yHW0OwcT3s3Y5rsSfkAmnmK/fZlA=; b=FhvO4vcz8/7MONPdlxwicTzAqnnB7AwAx652cjEFUrkbz75zNWGmDicTUTfRYa3m7Ysyx5 7/wTGpPmt+M9acF5AvdlfIwMRjRizEvR0ccTQprv4E3V/CmtK0Ikkl0oONQMnvZdq+qrSg 7AKNHO6BFBzzkbE2bt7ZJqMWAwIl39g= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DED5D1393C; Thu, 24 Apr 2025 17:25:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id j+4YNhB0CmgFKgAAD6G6ig (envelope-from ); Thu, 24 Apr 2025 17:25:36 +0000 From: David Sterba To: kdevops@lists.linux.dev Cc: David Sterba Subject: [PATCH] btrfs: remove discard=async from mount options Date: Thu, 24 Apr 2025 19:25:31 +0200 Message-ID: <20250424172531.3405647-1-dsterba@suse.com> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E988A21179 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:dkim,suse.com:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Flag: NO The option has been default since 6.2, no need to set it. Signed-off-by: David Sterba --- .../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