btrfs-progs: Replace usage of list_for_each with list_for_each_entry

[platform/upstream/btrfs-progs.git] / cmds-check.c

diff --git a/cmds-check.c b/cmds-check.c
index 7fc30da..5fc0ea9 100644 (file)
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -1635,8 +1635,9 @@ static int process_dir_item(struct extent_buffer *eb,
                                          namebuf, len, filetype,
                                          key->type, error);
                } else {
-                       fprintf(stderr, "invalid location in dir item %u\n",
-                               location.type);
+                       fprintf(stderr,
+                               "unknown location type %d in DIR_ITEM[%llu %llu]\n",
+                               location.type, key->objectid, key->offset);
                        add_inode_backref(inode_cache, BTRFS_MULTIPLE_OBJECTIDS,
                                          key->objectid, key->offset, namebuf,
                                          len, filetype, key->type, error);
@@ -2631,8 +2632,7 @@ static int repair_tree_block_ref(struct btrfs_trans_handle *trans,
                }
                btrfs_mark_buffer_dirty(eb);
                printf("Added an extent item [%llu %u]\n", bytenr, node_size);
-               btrfs_update_block_group(trans, extent_root, bytenr, node_size,
-                                        1, 0);
+               btrfs_update_block_group(extent_root, bytenr, node_size, 1, 0);
 
                nrefs->refs[level] = 0;
                nrefs->full_backref[level] =
@@ -8366,7 +8366,13 @@ static int process_extent_item(struct btrfs_root *root,
        if (item_size < sizeof(*ei)) {
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
                struct btrfs_extent_item_v0 *ei0;
-               BUG_ON(item_size != sizeof(*ei0));
+               if (item_size != sizeof(*ei0)) {
+                       error(
+       "invalid extent item format: ITEM[%llu %u %llu] leaf: %llu slot: %d",
+                               key.objectid, key.type, key.offset,
+                               btrfs_header_bytenr(eb), slot);
+                       BUG();
+               }
                ei0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_item_v0);
                refs = btrfs_extent_refs_v0(eb, ei0);
 #else
@@ -9661,7 +9667,7 @@ static int delete_extent_records(struct btrfs_trans_handle *trans,
                        u64 bytes = (found_key.type == BTRFS_EXTENT_ITEM_KEY) ?
                                found_key.offset : root->fs_info->nodesize;
 
-                       ret = btrfs_update_block_group(trans, root, bytenr,
+                       ret = btrfs_update_block_group(root, bytenr,
                                                       bytes, 0, 0);
                        if (ret)
                                break;
@@ -9740,7 +9746,7 @@ static int record_extent(struct btrfs_trans_handle *trans,
                }
 
                btrfs_mark_buffer_dirty(leaf);
-               ret = btrfs_update_block_group(trans, extent_root, rec->start,
+               ret = btrfs_update_block_group(extent_root, rec->start,
                                               rec->max_size, 1, 0);
                if (ret)
                        goto fail;
@@ -11973,7 +11979,7 @@ static int repair_extent_data_item(struct btrfs_trans_handle *trans,
                btrfs_set_extent_flags(eb, ei, BTRFS_EXTENT_FLAG_DATA);
 
                btrfs_mark_buffer_dirty(eb);
-               ret = btrfs_update_block_group(trans, extent_root, disk_bytenr,
+               ret = btrfs_update_block_group(extent_root, disk_bytenr,
                                               num_bytes, 1, 0);
                btrfs_release_path(&path);
        }