On 20.08.2018 16:34, Qu Wenruo wrote:
>
>
> On 2018/8/20 下午9:28, Nikolay Borisov wrote:
>> Rename the function so its name falls in line with the rest of btrfs
>> nomenclature. So when we change the uuid of the header it's in fact
>> of the buffer header.
>
> We have setget functions like btrfs_header_nritems() or
> btrfs_header_bytenr(), IMHO both ways make sense.
Yes, however, we don't really have such functions for the two fields.
Alternatively they could be introduced and will consist of only :
write_extent_buffer() calls and the cheks for
same_fsid/same_chunk_tree_uuid will still be retained in
change_buffer_header_uuid.
>
> Although I have no objection against current modification.
>
>> Also remove the root argument since it's used
>> solely to take a reference to fs_info which can be done via the
>> mandatory eb argument. No functional changes.>
>> Signed-off-by: Nikolay Borisov <nbori...@suse.com>
>
> Reviewed-by: Qu Wenruo <w...@suse.com>
>
> Thanks,
> Qu
>
>> ---
>> btrfstune.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/btrfstune.c b/btrfstune.c
>> index 723317a00f3a..3745a00c46ae 100644
>> --- a/btrfstune.c
>> +++ b/btrfstune.c
>> @@ -91,9 +91,9 @@ static int set_super_incompat_flags(struct btrfs_root
>> *root, u64 flags)
>> return ret;
>> }
>>
>> -static int change_header_uuid(struct btrfs_root *root, struct extent_buffer
>> *eb)
>> +static int change_buffer_header_uuid(struct extent_buffer *eb)
>> {
>> - struct btrfs_fs_info *fs_info = root->fs_info;
>> + struct btrfs_fs_info *fs_info = eb->fs_info;
>> int same_fsid = 1;
>> int same_chunk_tree_uuid = 1;
>> int ret;
>> @@ -157,7 +157,7 @@ static int change_extents_uuid(struct btrfs_fs_info
>> *fs_info)
>> ret = PTR_ERR(eb);
>> goto out;
>> }
>> - ret = change_header_uuid(root, eb);
>> + ret = change_buffer_header_uuid(eb);
>> free_extent_buffer(eb);
>> if (ret < 0) {
>> error("failed to change uuid of tree block: %llu",
>>
>
