diff options
| -rw-r--r-- | cmds-check.c | 8 | ||||
| -rw-r--r-- | disk-io.c | 5 | ||||
| -rw-r--r-- | free-space-cache.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/cmds-check.c b/cmds-check.c index 1569d6f4..b518a6b5 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -5759,6 +5759,10 @@ again: btrfs_level_size(root, btrfs_root_level(&ri)), 0); + if (!buf) { + ret = -EIO; + goto out; + } add_root_to_pending(buf, &extent_cache, &pending, &seen, &nodes, &found_key); @@ -5803,6 +5807,10 @@ again: btrfs_root_bytenr(&rec->ri), btrfs_level_size(root, btrfs_root_level(&rec->ri)), 0); + if (!buf) { + ret = -EIO; + goto out; + } add_root_to_pending(buf, &extent_cache, &pending, &seen, &nodes, &rec->found_key); while (1) { @@ -644,7 +644,10 @@ out: blocksize = btrfs_level_size(root, btrfs_root_level(&root->root_item)); root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item), blocksize, generation); - BUG_ON(!root->node); + if (!root->node) { + free(root); + return ERR_PTR(-EIO); + } insert: root->ref_cows = 1; return root; diff --git a/free-space-cache.c b/free-space-cache.c index 1ca7980d..55d73185 100644 --- a/free-space-cache.c +++ b/free-space-cache.c @@ -435,7 +435,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info, if (ret < 0) { ret = 0; - printf("failed to load free space cache for block group %llu", + printf("failed to load free space cache for block group %llu\n", block_group->key.objectid); } |