Skip to contentSkip to conversation

Btrfs: Fix an assert statement in __btrfs_map_block()

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 9, 2019 – Aug 22, 2019

Subsystems (2)
Kernel janitors Btrfs file system
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 Btrfs: Fix an assert statement in __btrfs_map_block()

The btrfs_get_chunk_map() never returns NULL, it returns error pointers.

Fixes 89b798ad1b42 ("btrfs: Use btrfs_get_io_geometry appropriately")
Signed-off-by Dan Carpenter <[email protected]>
---
 fs/btrfs/volumes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
index 6edd1d57e530..e69d135c7d3c 100644
@@ -5818,7 +5818,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
 		return ret;
 
 	em = btrfs_get_chunk_map(fs_info, logical, *length);
-	ASSERT(em);
+	ASSERT(!IS_ERR(em));
 	map = em->map_lookup;
 
 	*length = geom.len;
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Dan Carpenter

The btrfs_get_chunk_map() never returns NULL, it returns error pointers.

Fixes 89b798ad1b42 ("btrfs: Use btrfs_get_io_geometry appropriately")
Signed-off-by Dan Carpenter <[email protected]>
Reviewed-by Nikolay Borisov <[email protected]>
Quoted 18 lines
---
 fs/btrfs/volumes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/volumes.c +1 -1
index 6edd1d57e530..e69d135c7d3c 100644
@@ -5818,7 +5818,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
 		return ret;
 
 	em = btrfs_get_chunk_map(fs_info, logical, *length);
-	ASSERT(em);
+	ASSERT(!IS_ERR(em));
 	map = em->map_lookup;
 
 	*length = geom.len;