Re: [PATCH v3] btrfs: remove nonzero lowest level handling in btrfs_search_forward()

[Qu Wenruo <wqu@suse.com>]

在 2025/5/19 10:01, Sun YangKai 写道:
>> 在 2025/5/19 09:07, Sun YangKai 写道:
>> [...]
>>
>>> Thank you for your reply. I'll fix it and split this into smaller patches.
>>
>> I don't think you need to split, unless you really have a strong reason
>> to do extra refactor.
>>
>> Something like this will be enough (not yet tested):
>>
>> ```
>> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
>> index a2e7979372cc..ca63e0dad499 100644
>> --- a/fs/btrfs/ctree.c
>> +++ b/fs/btrfs/ctree.c
>> @@ -4615,6 +4615,7 @@ int btrfs_search_forward(struct btrfs_root *root,
>> struct btrfs_key *min_key,
>>           int keep_locks = path->keep_locks;
>>
>>           ASSERT(!path->nowait);
>> +       ASSERT(path->lowest_level == 0);
>>           path->keep_locks = 1;
>>    again:
>>           cur = btrfs_read_lock_root_node(root);
>> @@ -4637,7 +4638,7 @@ int btrfs_search_forward(struct btrfs_root *root,
>> struct btrfs_key *min_key,
>>                   }
>>
>>                   /* at the lowest level, we're done, setup the path and
>> exit */
>> -               if (level == path->lowest_level) {
>> +               if (level == 0) {
>>                           if (slot >= nritems)
>>                                   goto find_next_key;
>>                           ret = 0;
>> @@ -4678,12 +4679,6 @@ int btrfs_search_forward(struct btrfs_root *root,
>> struct btrfs_key *min_key,
>>                                   goto out;
>>                           }
>>                   }
>> -               if (level == path->lowest_level) {
>> -                       ret = 0;
>> -                       /* Save our key for returning back. */
>> -                       btrfs_node_key_to_cpu(cur, min_key, slot);
>> -                       goto out;
>> -               }
>>                   cur = btrfs_read_node_slot(cur, slot);
>>                   if (IS_ERR(cur)) {
>>                           ret = PTR_ERR(cur);
>> ```
> 
> Yep! This is exactly what I want. Actually I was doing changes with different
> purposes so that make things totally messed up :(
And this one is now properly tested too.

Thanks,
Qu