diff options
author | David Sterba <dsterba@suse.com> | 2019-03-20 11:18:57 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2019-04-29 13:02:33 -0400 |
commit | 4806bd886aa0f9d23072711a5d9c84ac6b6fcadf (patch) | |
tree | 3bae0e2c4eb5a6df9837492a17d95062ce0694c1 /fs/btrfs/tree-checker.c | |
parent | ce4252c049bd2df0270453e96fba0d0dd1db6db4 (diff) |
btrfs: tree-checker: get fs_info from eb in block_group_err
We can read fs_info from extent buffer and can drop it from the
parameters.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/tree-checker.c')
-rw-r--r-- | fs/btrfs/tree-checker.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 367651d7319e..b7201f4a12a6 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c | |||
@@ -354,12 +354,12 @@ static int check_dir_item(struct extent_buffer *leaf, | |||
354 | return 0; | 354 | return 0; |
355 | } | 355 | } |
356 | 356 | ||
357 | __printf(4, 5) | 357 | __printf(3, 4) |
358 | __cold | 358 | __cold |
359 | static void block_group_err(const struct btrfs_fs_info *fs_info, | 359 | static void block_group_err(const struct extent_buffer *eb, int slot, |
360 | const struct extent_buffer *eb, int slot, | ||
361 | const char *fmt, ...) | 360 | const char *fmt, ...) |
362 | { | 361 | { |
362 | const struct btrfs_fs_info *fs_info = eb->fs_info; | ||
363 | struct btrfs_key key; | 363 | struct btrfs_key key; |
364 | struct va_format vaf; | 364 | struct va_format vaf; |
365 | va_list args; | 365 | va_list args; |
@@ -392,13 +392,13 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, | |||
392 | * handle it. We care more about the size. | 392 | * handle it. We care more about the size. |
393 | */ | 393 | */ |
394 | if (key->offset == 0) { | 394 | if (key->offset == 0) { |
395 | block_group_err(fs_info, leaf, slot, | 395 | block_group_err(leaf, slot, |
396 | "invalid block group size 0"); | 396 | "invalid block group size 0"); |
397 | return -EUCLEAN; | 397 | return -EUCLEAN; |
398 | } | 398 | } |
399 | 399 | ||
400 | if (item_size != sizeof(bgi)) { | 400 | if (item_size != sizeof(bgi)) { |
401 | block_group_err(fs_info, leaf, slot, | 401 | block_group_err(leaf, slot, |
402 | "invalid item size, have %u expect %zu", | 402 | "invalid item size, have %u expect %zu", |
403 | item_size, sizeof(bgi)); | 403 | item_size, sizeof(bgi)); |
404 | return -EUCLEAN; | 404 | return -EUCLEAN; |
@@ -408,7 +408,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, | |||
408 | sizeof(bgi)); | 408 | sizeof(bgi)); |
409 | if (btrfs_block_group_chunk_objectid(&bgi) != | 409 | if (btrfs_block_group_chunk_objectid(&bgi) != |
410 | BTRFS_FIRST_CHUNK_TREE_OBJECTID) { | 410 | BTRFS_FIRST_CHUNK_TREE_OBJECTID) { |
411 | block_group_err(fs_info, leaf, slot, | 411 | block_group_err(leaf, slot, |
412 | "invalid block group chunk objectid, have %llu expect %llu", | 412 | "invalid block group chunk objectid, have %llu expect %llu", |
413 | btrfs_block_group_chunk_objectid(&bgi), | 413 | btrfs_block_group_chunk_objectid(&bgi), |
414 | BTRFS_FIRST_CHUNK_TREE_OBJECTID); | 414 | BTRFS_FIRST_CHUNK_TREE_OBJECTID); |
@@ -416,7 +416,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, | |||
416 | } | 416 | } |
417 | 417 | ||
418 | if (btrfs_block_group_used(&bgi) > key->offset) { | 418 | if (btrfs_block_group_used(&bgi) > key->offset) { |
419 | block_group_err(fs_info, leaf, slot, | 419 | block_group_err(leaf, slot, |
420 | "invalid block group used, have %llu expect [0, %llu)", | 420 | "invalid block group used, have %llu expect [0, %llu)", |
421 | btrfs_block_group_used(&bgi), key->offset); | 421 | btrfs_block_group_used(&bgi), key->offset); |
422 | return -EUCLEAN; | 422 | return -EUCLEAN; |
@@ -424,7 +424,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, | |||
424 | 424 | ||
425 | flags = btrfs_block_group_flags(&bgi); | 425 | flags = btrfs_block_group_flags(&bgi); |
426 | if (hweight64(flags & BTRFS_BLOCK_GROUP_PROFILE_MASK) > 1) { | 426 | if (hweight64(flags & BTRFS_BLOCK_GROUP_PROFILE_MASK) > 1) { |
427 | block_group_err(fs_info, leaf, slot, | 427 | block_group_err(leaf, slot, |
428 | "invalid profile flags, have 0x%llx (%lu bits set) expect no more than 1 bit set", | 428 | "invalid profile flags, have 0x%llx (%lu bits set) expect no more than 1 bit set", |
429 | flags & BTRFS_BLOCK_GROUP_PROFILE_MASK, | 429 | flags & BTRFS_BLOCK_GROUP_PROFILE_MASK, |
430 | hweight64(flags & BTRFS_BLOCK_GROUP_PROFILE_MASK)); | 430 | hweight64(flags & BTRFS_BLOCK_GROUP_PROFILE_MASK)); |
@@ -437,7 +437,7 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, | |||
437 | type != BTRFS_BLOCK_GROUP_SYSTEM && | 437 | type != BTRFS_BLOCK_GROUP_SYSTEM && |
438 | type != (BTRFS_BLOCK_GROUP_METADATA | | 438 | type != (BTRFS_BLOCK_GROUP_METADATA | |
439 | BTRFS_BLOCK_GROUP_DATA)) { | 439 | BTRFS_BLOCK_GROUP_DATA)) { |
440 | block_group_err(fs_info, leaf, slot, | 440 | block_group_err(leaf, slot, |
441 | "invalid type, have 0x%llx (%lu bits set) expect either 0x%llx, 0x%llx, 0x%llx or 0x%llx", | 441 | "invalid type, have 0x%llx (%lu bits set) expect either 0x%llx, 0x%llx, 0x%llx or 0x%llx", |
442 | type, hweight64(type), | 442 | type, hweight64(type), |
443 | BTRFS_BLOCK_GROUP_DATA, BTRFS_BLOCK_GROUP_METADATA, | 443 | BTRFS_BLOCK_GROUP_DATA, BTRFS_BLOCK_GROUP_METADATA, |