Re: [PATCH 2/2] btrfs: output more info when duplicated ordered extent is found

[Qu Wenruo <wqu@suse.com>]

在 2026/3/14 06:08, David Sterba 写道:
> On Sat, Mar 07, 2026 at 07:43:37PM +1030, Qu Wenruo wrote:
>> During development of a new feature, I triggered that btrfs_panic()
>> inside insert_ordered_extent() and spent quite some unnecessary before
>> noticing I'm passing incorrect flags when creating a new ordered extent.
>>
>> Unfortunately the existing error message is not providing much help.
>>
>> Enhance the output to provide file offset, num bytes and flags of both
>> existing and new ordered extents.
>>
>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>> ---
>>   fs/btrfs/ordered-data.c | 11 ++++++++---
>>   1 file changed, 8 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
>> index b34a0df282f3..bc88b904d024 100644
>> --- a/fs/btrfs/ordered-data.c
>> +++ b/fs/btrfs/ordered-data.c
>> @@ -253,10 +253,15 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry)
>>   	spin_lock(&inode->ordered_tree_lock);
>>   	node = tree_insert(&inode->ordered_tree, entry->file_offset,
>>   			   &entry->rb_node);
>> -	if (unlikely(node))
>> +	if (unlikely(node)) {
>> +		struct btrfs_ordered_extent *exist =
>> +			rb_entry(node, struct btrfs_ordered_extent, rb_node);
>> +
>>   		btrfs_panic(fs_info, -EEXIST,
>> -				"inconsistency in ordered tree at offset %llu",
>> -				entry->file_offset);
>> +"existing oe file_offset=%llu num_bytes=%llu flags=0x%lx new oe file_offset=%llu num_bytes=%llu flags=0x%lx",
> 
> This uses the "key=value" format while this is an exception in the
> messages. The tracepoints use "=" as it's main purpose is to print just
> a list of values but messages also contain other text. We should keep it
> consistent.

Got it, will go using the existing "key value" style.

Thanks,
Qu

> 
>> +			    exist->file_offset, exist->num_bytes, exist->flags,
>> +			    entry->file_offset, entry->num_bytes, entry->flags);
>> +	}
>>   	spin_unlock(&inode->ordered_tree_lock);
>>   
>>   	spin_lock(&root->ordered_extent_lock);
>> -- 
>> 2.53.0
>>