From: Anand Jain Date: Thu, 2 Mar 2023 13:30:48 +0000 (+0800) Subject: btrfs: remove redundant clearing of NODISCARD X-Git-Tag: v6.4-rc1~141^2~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce4cf3793e72a4ca2eeebc5db5d04f25b42a59db;p=thirdparty%2Fkernel%2Flinux.git btrfs: remove redundant clearing of NODISCARD If no discard mount option is specified, including the NODISCARD option, we make the async discard the default option then we don't have to call the clear_opt again to clear the NODISCARD flag. Though this makes no difference, that the call is redundant has been pointed out several times so we better remove it. Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8aff348369d73..991ff26fb8c62 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3689,7 +3689,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device fs_info->fs_devices->discardable) { btrfs_set_and_info(fs_info, DISCARD_ASYNC, "auto enabling async discard"); - btrfs_clear_opt(fs_info->mount_opt, NODISCARD); } #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY