]> git.sur5r.net Git - u-boot/commitdiff
fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE
authorYevgeny Popovych <yevgenyp@pointgrab.com>
Tue, 5 Jun 2018 10:11:01 +0000 (13:11 +0300)
committerTom Rini <trini@konsulko.com>
Wed, 13 Jun 2018 11:49:12 +0000 (07:49 -0400)
This causes errors when translating logical addresses to physical:
  btrfs_map_logical_to_physical: Cannot map logical address <addr> to physical
  btrfs_file_read: Error reading extent

The behavior of btrfs_map_logical_to_physical() is to stop traversing
CHUNK_TREE when it encounters first non-CHUNK_ITEM, which makes
only some portion of CHUNK_ITEMs being read.
Change it to skip over non-chunk items.

Signed-off-by: Yevgeny Popovych <yevgenyp@pointgrab.com>
Cc: Marek Behun <marek.behun@nic.cz>
Cc: Sergey Struzh <sergeys@pointgrab.com>
Reviewed-by: Marek Behun <marek.behun@nic.cz>
fs/btrfs/chunk-map.c

index b3b5ef7652e2c6ba4030b00df33443bb58ca8cda..beb6a4bb928e79819a529fb1c611a421bc7ae38b 100644 (file)
@@ -158,7 +158,7 @@ int btrfs_read_chunk_tree(void)
        do {
                found_key = btrfs_path_leaf_key(&path);
                if (btrfs_comp_keys_type(&key, found_key))
-                       break;
+                       continue;
 
                chunk = btrfs_path_item_ptr(&path, struct btrfs_chunk);
                btrfs_chunk_to_cpu(chunk);