* [PATCH] btrfs: zoned: Remove some code duplication
@ 2025-02-19 14:10 Christophe JAILLET
2025-02-20 5:55 ` Naohiro Aota
0 siblings, 1 reply; 4+ messages in thread
From: Christophe JAILLET @ 2025-02-19 14:10 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba
Cc: linux-kernel, kernel-janitors, Christophe JAILLET, linux-btrfs
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@wanadoo.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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] btrfs: zoned: Remove some code duplication
2025-02-19 14:10 [PATCH] btrfs: zoned: Remove some code duplication Christophe JAILLET
@ 2025-02-20 5:55 ` Naohiro Aota
2025-02-20 7:11 ` Christophe JAILLET
0 siblings, 1 reply; 4+ messages in thread
From: Naohiro Aota @ 2025-02-20 5:55 UTC (permalink / raw)
To: Christophe JAILLET, Chris Mason, Josef Bacik, David Sterba
Cc: linux-kernel, kernel-janitors, linux-btrfs
On Wed Feb 19, 2025 at 11:10 PM JST, Christophe JAILLET wrote:
> 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@wanadoo.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) &&
Thanks, but which repository/branch are you working with? I cannot
find the duplicated lines in btrfs/for-next, linus/master, nor
linux-stable. Also, the pointed commit seems wrong too.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] btrfs: zoned: Remove some code duplication
2025-02-20 5:55 ` Naohiro Aota
@ 2025-02-20 7:11 ` Christophe JAILLET
2025-02-26 15:20 ` David Sterba
0 siblings, 1 reply; 4+ messages in thread
From: Christophe JAILLET @ 2025-02-20 7:11 UTC (permalink / raw)
To: Naohiro Aota, Chris Mason, Josef Bacik, David Sterba
Cc: linux-kernel, kernel-janitors, linux-btrfs
Le 20/02/2025 à 06:55, Naohiro Aota a écrit :
> On Wed Feb 19, 2025 at 11:10 PM JST, Christophe JAILLET wrote:
>> 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@wanadoo.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) &&
>
> Thanks, but which repository/branch are you working with? I cannot
> find the duplicated lines in btrfs/for-next, linus/master, nor
> linux-stable. Also, the pointed commit seems wrong too.
Sorry for the lack of context.
This is based on linux-next. In my case -next-20250219
This can be seen at :
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/fs/btrfs/zoned.c?id=efe28fcf2e47aa5142bff2c284ea7337b40901e8#n1666
The commit Id is the one given at :
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/fs/btrfs/zoned.c?id=efe28fcf2e47aa5142bff2c284ea7337b40901e8
CJ
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] btrfs: zoned: Remove some code duplication
2025-02-20 7:11 ` Christophe JAILLET
@ 2025-02-26 15:20 ` David Sterba
0 siblings, 0 replies; 4+ messages in thread
From: David Sterba @ 2025-02-26 15:20 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Naohiro Aota, Chris Mason, Josef Bacik, David Sterba,
linux-kernel, kernel-janitors, linux-btrfs
On Thu, Feb 20, 2025 at 08:11:46AM +0100, Christophe JAILLET wrote:
> Le 20/02/2025 à 06:55, Naohiro Aota a écrit :
> > On Wed Feb 19, 2025 at 11:10 PM JST, Christophe JAILLET wrote:
> >> 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@wanadoo.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) &&
> >
> > Thanks, but which repository/branch are you working with? I cannot
> > find the duplicated lines in btrfs/for-next, linus/master, nor
> > linux-stable. Also, the pointed commit seems wrong too.
>
> Sorry for the lack of context.
>
> This is based on linux-next. In my case -next-20250219
>
> This can be seen at :
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/fs/btrfs/zoned.c?id=efe28fcf2e47aa5142bff2c284ea7337b40901e8#n1666
>
> The commit Id is the one given at :
>
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/fs/btrfs/zoned.c?id=efe28fcf2e47aa5142bff2c284ea7337b40901e8
For the record, the patch has been removed from for-next, and it was
actually wrong, probably a result of some rebase conflict.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-26 15:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-19 14:10 [PATCH] btrfs: zoned: Remove some code duplication Christophe JAILLET
2025-02-20 5:55 ` Naohiro Aota
2025-02-20 7:11 ` Christophe JAILLET
2025-02-26 15:20 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®