Commit 36778716 authored by Mike Snitzer's avatar Mike Snitzer

dm vdo block-map: remove extra vdo arg from initialize_block_map_zone

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: default avatarMike Snitzer <snitzer@kernel.org>
Signed-off-by: default avatarMatthew Sakai <msakai@redhat.com>
parent 8810d3d5
...@@ -2719,12 +2719,12 @@ void vdo_traverse_forest(struct block_map *map, vdo_entry_callback_fn callback, ...@@ -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, static int __must_check initialize_block_map_zone(struct block_map *map,
zone_count_t zone_number, zone_count_t zone_number,
struct vdo *vdo,
page_count_t cache_size, page_count_t cache_size,
block_count_t maximum_age) block_count_t maximum_age)
{ {
int result; int result;
block_count_t i; block_count_t i;
struct vdo *vdo = map->vdo;
struct block_map_zone *zone = &map->zones[zone_number]; struct block_map_zone *zone = &map->zones[zone_number];
BUILD_BUG_ON(sizeof(struct page_descriptor) != sizeof(u64)); 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 ...@@ -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; map->zone_count = vdo->thread_config.logical_zone_count;
for (zone = 0; zone < map->zone_count; zone++) { for (zone = 0; zone < map->zone_count; zone++) {
result = initialize_block_map_zone(map, zone, vdo, cache_size, result = initialize_block_map_zone(map, zone, cache_size, maximum_age);
maximum_age);
if (result != VDO_SUCCESS) { if (result != VDO_SUCCESS) {
vdo_free_block_map(map); vdo_free_block_map(map);
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment