summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevgeny Popovych <yevgenyp@pointgrab.com>2018-06-05 13:11:01 +0300
committerTom Rini <trini@konsulko.com>2018-06-13 07:49:12 -0400
commitf559180176a8650a78edb5be73935f51cd6a0064 (patch)
treecde02d36f03e79eae1cab96f60c7658515726775
parent5b3da7fa12f3720c4e4051af21261765bf9c44e6 (diff)
fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE
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>
-rw-r--r--fs/btrfs/chunk-map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c
index b3b5ef7652..beb6a4bb92 100644
--- a/fs/btrfs/chunk-map.c
+++ b/fs/btrfs/chunk-map.c
@@ -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);