projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: image: move metadump definitions to own header
[platform/upstream/btrfs-progs.git]
/
print-tree.c
diff --git
a/print-tree.c
b/print-tree.c
index
c752ba2
..
3c585e3
100644
(file)
--- a/
print-tree.c
+++ b/
print-tree.c
@@
-198,9
+198,17
@@
void print_chunk_item(struct extent_buffer *eb, struct btrfs_chunk *chunk)
{
u16 num_stripes = btrfs_chunk_num_stripes(eb, chunk);
int i;
{
u16 num_stripes = btrfs_chunk_num_stripes(eb, chunk);
int i;
- u32 chunk_item_size
= btrfs_chunk_item_size(num_stripes)
;
+ u32 chunk_item_size;
char chunk_flags_str[32] = {0};
char chunk_flags_str[32] = {0};
+ /* The chunk must contain at least one stripe */
+ if (num_stripes < 1) {
+ printf("invalid num_stripes: %u\n", num_stripes);
+ return;
+ }
+
+ chunk_item_size = btrfs_chunk_item_size(num_stripes);
+
if ((unsigned long)chunk + chunk_item_size > eb->len) {
printf("\t\tchunk item invalid\n");
return;
if ((unsigned long)chunk + chunk_item_size > eb->len) {
printf("\t\tchunk item invalid\n");
return;
@@
-315,6
+323,9
@@
static void compress_type_to_str(u8 compress_type, char *ret)
case BTRFS_COMPRESS_LZO:
strcpy(ret, "lzo");
break;
case BTRFS_COMPRESS_LZO:
strcpy(ret, "lzo");
break;
+ case BTRFS_COMPRESS_ZSTD:
+ strcpy(ret, "zstd");
+ break;
default:
sprintf(ret, "UNKNOWN.%d", compress_type);
}
default:
sprintf(ret, "UNKNOWN.%d", compress_type);
}
@@
-1247,7
+1258,7
@@
void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
break;
case BTRFS_EXTENT_CSUM_KEY:
print_extent_csum(eb, root->fs_info, item_size,
break;
case BTRFS_EXTENT_CSUM_KEY:
print_extent_csum(eb, root->fs_info, item_size,
-
disk_key.
offset);
+ offset);
break;
case BTRFS_EXTENT_DATA_KEY:
print_file_extent_item(eb, item, i, ptr);
break;
case BTRFS_EXTENT_DATA_KEY:
print_file_extent_item(eb, item, i, ptr);