[U-Boot] [PATCH] fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE

[U-Boot] [PATCH] fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE

[Yevgeny Popovych]

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>
---
 fs/btrfs/chunk-map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c
index b3b5ef7..beb6a4b 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);
-- 
2.7.4

[U-Boot] [PATCH] fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE

[Marek Behún]

Hmm, for some reason there are some items with objectid=0 and type=0
betwenn CHUNK_ITEM_KEYs, and thus the reading breaks before reading all
items. I am not sure if this is an error in our driver or there really
are such items, but yout patch solves this.

Reviewed-by: Marek Behun <marek.behun@nic.cz>

On Tue,  5 Jun 2018 13:11:01 +0300
Yevgeny Popovych <yevgenyp@pointgrab.com> wrote:

> 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>
> ---
>  fs/btrfs/chunk-map.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/chunk-map.c b/fs/btrfs/chunk-map.c
> index b3b5ef7..beb6a4b 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);

[U-Boot] fs: btrfs: Fix not all CHUNK_ITEMs being read from CHUNK_TREE

[Tom Rini]

On Tue, Jun 05, 2018 at 01:11:01PM +0300, Yevgeny Popovych wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180613/799ac981/attachment.sig>