]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dm vdo block-map: remove extra vdo arg from initialize_block_map_zone
authorMike Snitzer <snitzer@kernel.org>
Sat, 27 Jan 2024 02:35:47 +0000 (21:35 -0500)
committerMike Snitzer <snitzer@kernel.org>
Tue, 20 Feb 2024 18:43:17 +0000 (13:43 -0500)
The block_map is passed to initialize_block_map_zone, but the
block_map's vdo member is already initialized with the same vdo
instance, so just use it.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
drivers/md/dm-vdo/block-map.c

index eb838e6ae3e630ab87c4afcb3c711c5a1ddc9253..eda42383a2c141decb84e7b2965e3543522daab5 100644 (file)
@@ -2719,12 +2719,12 @@ void vdo_traverse_forest(struct block_map *map, vdo_entry_callback_fn callback,
  */
 static int __must_check initialize_block_map_zone(struct block_map *map,
                                                  zone_count_t zone_number,
-                                                 struct vdo *vdo,
                                                  page_count_t cache_size,
                                                  block_count_t maximum_age)
 {
        int result;
        block_count_t i;
+       struct vdo *vdo = map->vdo;
        struct block_map_zone *zone = &map->zones[zone_number];
 
        BUILD_BUG_ON(sizeof(struct page_descriptor) != sizeof(u64));
@@ -2898,8 +2898,7 @@ int vdo_decode_block_map(struct block_map_state_2_0 state, block_count_t logical
 
        map->zone_count = vdo->thread_config.logical_zone_count;
        for (zone = 0; zone < map->zone_count; zone++) {
-               result = initialize_block_map_zone(map, zone, vdo, cache_size,
-                                                  maximum_age);
+               result = initialize_block_map_zone(map, zone, cache_size, maximum_age);
                if (result != VDO_SUCCESS) {
                        vdo_free_block_map(map);
                        return result;