linux-kernel - [PATCH] btrfs: zoned: Remove some code duplication

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <74072f83285f96aba98add7d24c9f944d22a721b.1739974151.git.christophe.jaillet@wanadoo.fr>
Date: Wed, 19 Feb 2025 15:10:21 +0100
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: Chris Mason <clm@...com>,
	Josef Bacik <josef@...icpanda.com>,
	David Sterba <dsterba@...e.com>
Cc: linux-kernel@...r.kernel.org,
	kernel-janitors@...r.kernel.org,
	Christophe JAILLET <christophe.jaillet@...adoo.fr>,
	linux-btrfs@...r.kernel.org
Subject: [PATCH] btrfs: zoned: Remove some code duplication

This code snippet is written twice in row, so remove one of them.

This was apparently added by accident in commit efe28fcf2e47 ("btrfs:
handle unexpected parent block offset in btrfs_alloc_tree_block()")

Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
---
 fs/btrfs/zoned.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index b5b9d16664a8..6c4534316aad 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1663,15 +1663,6 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)
 	}
 
 out:
-	/* Reject non SINGLE data profiles without RST */
-	if ((map->type & BTRFS_BLOCK_GROUP_DATA) &&
-	    (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK) &&
-	    !fs_info->stripe_root) {
-		btrfs_err(fs_info, "zoned: data %s needs raid-stripe-tree",
-			  btrfs_bg_type_to_raid_name(map->type));
-		return -EINVAL;
-	}
-
 	/* Reject non SINGLE data profiles without RST. */
 	if ((map->type & BTRFS_BLOCK_GROUP_DATA) &&
 	    (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK) &&
-- 
2.48.1