p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btrfs: tree-checker: get fs_info from eb in dev_item_err 

We can read fs_info from extent buffer and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-03-20 16:22:58 +01:00
parent d001e4a3fe
commit 5617ed80cb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/btrfs/tree-checker.c
View File

@ -606,10 +606,9 @@ int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info,
return 0; return 0;
} }
__printf(4, 5) __printf(3, 4)
__cold __cold
static void dev_item_err(const struct btrfs_fs_info *fs_info, static void dev_item_err(const struct extent_buffer *eb, int slot,
const struct extent_buffer *eb, int slot,
const char *fmt, ...) const char *fmt, ...)
{ {
struct btrfs_key key; struct btrfs_key key;
@ -622,7 +621,7 @@ static void dev_item_err(const struct btrfs_fs_info *fs_info,
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
btrfs_crit(fs_info, btrfs_crit(eb->fs_info,
"corrupt %s: root=%llu block=%llu slot=%d devid=%llu %pV", "corrupt %s: root=%llu block=%llu slot=%d devid=%llu %pV",
btrfs_header_level(eb) == 0 ? "leaf" : "node", btrfs_header_level(eb) == 0 ? "leaf" : "node",
btrfs_header_owner(eb), btrfs_header_bytenr(eb), slot, btrfs_header_owner(eb), btrfs_header_bytenr(eb), slot,
@ -638,20 +637,20 @@ static int check_dev_item(struct btrfs_fs_info *fs_info,
u64 max_devid = max(BTRFS_MAX_DEVS(fs_info), BTRFS_MAX_DEVS_SYS_CHUNK); u64 max_devid = max(BTRFS_MAX_DEVS(fs_info), BTRFS_MAX_DEVS_SYS_CHUNK);
if (key->objectid != BTRFS_DEV_ITEMS_OBJECTID) { if (key->objectid != BTRFS_DEV_ITEMS_OBJECTID) {
dev_item_err(fs_info, leaf, slot, dev_item_err(leaf, slot,
"invalid objectid: has=%llu expect=%llu", "invalid objectid: has=%llu expect=%llu",
key->objectid, BTRFS_DEV_ITEMS_OBJECTID); key->objectid, BTRFS_DEV_ITEMS_OBJECTID);
return -EUCLEAN; return -EUCLEAN;
} }
if (key->offset > max_devid) { if (key->offset > max_devid) {
dev_item_err(fs_info, leaf, slot, dev_item_err(leaf, slot,
"invalid devid: has=%llu expect=[0, %llu]", "invalid devid: has=%llu expect=[0, %llu]",
key->offset, max_devid); key->offset, max_devid);
return -EUCLEAN; return -EUCLEAN;
} }
ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item); ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item);
if (btrfs_device_id(leaf, ditem) != key->offset) { if (btrfs_device_id(leaf, ditem) != key->offset) {
dev_item_err(fs_info, leaf, slot, dev_item_err(leaf, slot,
"devid mismatch: key has=%llu item has=%llu", "devid mismatch: key has=%llu item has=%llu",
key->offset, btrfs_device_id(leaf, ditem)); key->offset, btrfs_device_id(leaf, ditem));
return -EUCLEAN; return -EUCLEAN;
@ -664,7 +663,7 @@ static int check_dev_item(struct btrfs_fs_info *fs_info,
*/ */
if (btrfs_device_bytes_used(leaf, ditem) > if (btrfs_device_bytes_used(leaf, ditem) >
btrfs_device_total_bytes(leaf, ditem)) { btrfs_device_total_bytes(leaf, ditem)) {
dev_item_err(fs_info, leaf, slot, dev_item_err(leaf, slot,
"invalid bytes used: have %llu expect [0, %llu]", "invalid bytes used: have %llu expect [0, %llu]",
btrfs_device_bytes_used(leaf, ditem), btrfs_device_bytes_used(leaf, ditem),
btrfs_device_total_bytes(leaf, ditem)); btrfs_device_total_bytes(leaf, ditem));