diff options
| author | Qu Wenruo <wqu@suse.com> | 2018-06-06 15:27:13 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-08-06 15:00:34 +0200 |
| commit | 3c042605db2238c09f56c197a58624d4e10c5d2e (patch) | |
| tree | 16d840e1e8f861cb26e369a0e76b78e2ba599a53 /print-tree.c | |
| parent | 90b677a2d7e6b14e3047b5ac8625269378c1198f (diff) | |
btrfs-progs: Get rid of the confusing btrfs_file_extent_inline_len()
[BUG]
If one uncompressed inline extent has incorrect ram_bytes, neither btrfs
check nor dump-tree could detect such corruption.
[CAUSE]
Every caller tries to read inline extent ram_bytes is using
btrfs_file_extent_inline_len(), other than directly calling
btrfs_file_extent_ram_bytes().
For compressed extent, it's just calling btrfs_file_extent_ram_bytes().
However for uncompressed extent, it falls back to
btrfs_file_extent_inline_item_len(), makes us unable to detect anything
wrong in ram_bytes.
[FIX]
Just get rid of such confusing btrfs_file_extent_inline_len() function.
Reported-by: Steve Leung <sjleung@shaw.ca>
Tested-by: Steve Leung <sjleung@shaw.ca>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'print-tree.c')
| -rw-r--r-- | print-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print-tree.c b/print-tree.c index dfa7bb6b..a09ecfbb 100644 --- a/print-tree.c +++ b/print-tree.c @@ -357,9 +357,9 @@ static void print_file_extent_item(struct extent_buffer *eb, extent_type, file_extent_type_to_str(extent_type)); if (extent_type == BTRFS_FILE_EXTENT_INLINE) { - printf("\t\tinline extent data size %u ram_bytes %u compression %hhu (%s)\n", + printf("\t\tinline extent data size %u ram_bytes %llu compression %hhu (%s)\n", btrfs_file_extent_inline_item_len(eb, item), - btrfs_file_extent_inline_len(eb, slot, fi), + btrfs_file_extent_ram_bytes(eb, fi), btrfs_file_extent_compression(eb, fi), compress_str); return; |