On 2018年06月06日 16:08, Su Yue wrote:
>
>
> On 06/06/2018 03:27 PM, Qu Wenruo wrote:
>> It looks like that around 2014, btrfs kernel has a regression that would
>> cause offset-by-one ram_bytes for inline extent.
>>
>> Add the ability to repair it in original mode.
>>
>> Reported-by: Steve Leung <sjleung@xxxxxxx>
>> Signed-off-by: Qu Wenruo <wqu@xxxxxxxx>
>> ---
>> check/main.c | 44 +++++++++++++++++++++++++++++++++++++++++--
>> check/mode-original.h | 1 +
>> 2 files changed, 43 insertions(+), 2 deletions(-)
>>
>> diff --git a/check/main.c b/check/main.c
>> index 52ef181add61..1374d8856d72 100644
>> --- a/check/main.c
>> +++ b/check/main.c
>> @@ -1483,6 +1483,9 @@ static int process_file_extent(struct btrfs_root *root,
>> } else {
>> if (num_bytes > max_inline_size)
>> rec->errors |= I_ERR_FILE_EXTENT_TOO_LARGE;
>> + if (btrfs_file_extent_inline_item_len(eb, item) !=
>> + num_bytes)
>> + rec->errors |= I_ERR_INLINE_RAM_BYTES_WRONG;
>> }
>> rec->found_size += num_bytes;
>> num_bytes = (num_bytes + mask) & ~mask;
>> @@ -2534,6 +2537,40 @@ out:
>> return ret;
>> }
>>
>> +static int repair_inline_ram_bytes(struct btrfs_trans_handle *trans,
>> + struct btrfs_root *root,
>> + struct btrfs_path *path,
>> + struct inode_record *rec)
>> +{
>> + struct btrfs_key key;
>> + struct btrfs_file_extent_item *fi;
>> + struct btrfs_item *i;
>> + u64 on_disk_item_len;
>> + int ret;
>> +
>> + key.objectid = rec->ino;
>> + key.offset = 0;
>> + key.type = BTRFS_EXTENT_DATA_KEY;
>> +
>> + ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
>> + if (ret > 0)
>> + ret = -ENOENT;
>> + if (ret < 0)
>> + goto out;
>> +
>> + i = btrfs_item_nr(path->slots[0]);
>> + on_disk_item_len = btrfs_file_extent_inline_item_len(path->nodes[0], i);
>> + fi = btrfs_item_ptr(path->nodes[0], path->slots[0],
>> + struct btrfs_file_extent_item);
>> + btrfs_set_file_extent_ram_bytes(path->nodes[0], fi, on_disk_item_len);
>> + btrfs_mark_buffer_dirty(path->nodes[0]);
>> + printf("Successfully repaired inline ram_bytes for root %llu ino %llu\n",
>> + root->objectid, rec->ino);
>
> Miss a line "rec->errors &= ~I_ERR_INLINE_RAM_BYTES_WRONG;"?.
> Although the new test case passes, the fake appearance is due to
> existed bug about returned codes of check_ino_rec().
Oh, I forgot this one, thanks for pointing out.
Thanks,
Qu
>
> And refer to outputs of existed code, no need for the word
> 'Successfully'.
>> +out:
>> + btrfs_release_path(path);
>> + return ret;
>> +}
>> +
>> static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
>> {
>> struct btrfs_trans_handle *trans;
>> @@ -2545,8 +2582,9 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
>> I_ERR_LINK_COUNT_WRONG |
>> I_ERR_NO_INODE_ITEM |
>> I_ERR_FILE_EXTENT_ORPHAN |
>> - I_ERR_FILE_EXTENT_DISCOUNT|
>> - I_ERR_FILE_NBYTES_WRONG)))
>> + I_ERR_FILE_EXTENT_DISCOUNT |
>> + I_ERR_FILE_NBYTES_WRONG |
>> + I_ERR_INLINE_RAM_BYTES_WRONG)))
>
> It's better if you can add otehr infomation into print_inode_error().
>
> Others look fine to me.
>
> Thanks,
> Su
>> return rec->errors;
>>
>> /*
>> @@ -2575,6 +2613,8 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
>> ret = repair_inode_nlinks(trans, root, &path, rec);
>> if (!ret && rec->errors & I_ERR_FILE_NBYTES_WRONG)
>> ret = repair_inode_nbytes(trans, root, &path, rec);
>> + if (!ret && rec->errors & I_ERR_INLINE_RAM_BYTES_WRONG)
>> + ret = repair_inline_ram_bytes(trans, root, &path, rec);
>> btrfs_commit_transaction(trans, root);
>> btrfs_release_path(&path);
>> return ret;
>> diff --git a/check/mode-original.h b/check/mode-original.h
>> index 13cfa5b9e1b3..ec2842e0b3be 100644
>> --- a/check/mode-original.h
>> +++ b/check/mode-original.h
>> @@ -187,6 +187,7 @@ struct file_extent_hole {
>> #define I_ERR_FILE_EXTENT_ORPHAN (1 << 14)
>> #define I_ERR_FILE_EXTENT_TOO_LARGE (1 << 15)
>> #define I_ERR_ODD_INODE_FLAGS (1 << 16)
>> +#define I_ERR_INLINE_RAM_BYTES_WRONG (1 << 17)
>>
>> struct inode_record {
>> struct list_head backrefs;
>>
>
>
Attachment:
signature.asc
Description: OpenPGP digital signature
