Btrfs progs v4.15

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

diff --git a/cmds-check.c b/cmds-check.c
index 791fab6..99fbafc 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] =
@@ -5873,8 +5873,9 @@ static int check_file_extent(struct btrfs_root *root, struct btrfs_key *fkey,
                if (!repair || ret) {
                        err |= FILE_EXTENT_ERROR;
                        error(
-               "root %llu EXTENT_DATA[%llu %llu] interrupt, should start at %llu",
-                       root->objectid, fkey->objectid, fkey->offset, *end);
+"root %llu EXTENT_DATA[%llu %llu] gap exists, expected: EXTENT_DATA[%llu %llu]",
+                               root->objectid, fkey->objectid, fkey->offset,
+                               fkey->objectid, *end);
                }
        }
 
@@ -8365,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
@@ -9660,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;
@@ -9739,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;
@@ -11972,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);
        }
@@ -12518,11 +12525,17 @@ static int check_extent_data_backref(struct btrfs_fs_info *fs_info,
                 * Except normal disk bytenr and disk num bytes, we still
                 * need to do extra check on dbackref offset as
                 * dbackref offset = file_offset - file_extent_offset
+                *
+                * Also, we must check the leaf owner.
+                * In case of shared tree blocks (snapshots) we can inherit
+                * leaves from source snapshot.
+                * In that case, reference from source snapshot should not
+                * count.
                 */
                if (btrfs_file_extent_disk_bytenr(leaf, fi) == bytenr &&
                    btrfs_file_extent_disk_num_bytes(leaf, fi) == len &&
                    (u64)(key.offset - btrfs_file_extent_offset(leaf, fi)) ==
-                   offset)
+                   offset && btrfs_header_owner(leaf) == root_id)
                        found_count++;
 
 next:
@@ -13075,7 +13088,7 @@ static int repair_chunk_item(struct btrfs_trans_handle *trans,
 
        if (err & REFERENCER_MISSING) {
                ret = btrfs_make_block_group(trans, chunk_root->fs_info, 0,
-                    type, chunk_key.objectid, chunk_key.offset, length);
+                                            type, chunk_key.offset, length);
                if (ret) {
                        error("fail to add block group item[%llu %llu]",
                              chunk_key.offset, length);
@@ -13667,8 +13680,7 @@ static int reset_block_groups(struct btrfs_fs_info *fs_info)
 
                chunk = btrfs_item_ptr(leaf, path.slots[0], struct btrfs_chunk);
                btrfs_add_block_group(fs_info, 0,
-                                     btrfs_chunk_type(leaf, chunk),
-                                     key.objectid, key.offset,
+                                     btrfs_chunk_type(leaf, chunk), key.offset,
                                      btrfs_chunk_length(leaf, chunk));
                set_extent_dirty(&fs_info->free_space_cache, key.offset,
                                 key.offset + btrfs_chunk_length(leaf, chunk));