1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/md/dm-vdo/config.c b/drivers/md/dm-vdo/config.c
index 96e27aeecc25..cd5c36de6e2b 100644
--- a/drivers/md/dm-vdo/config.c
+++ b/drivers/md/dm-vdo/config.c
@@ -28,10 +28,10 @@ static bool is_version(const u8 *version, u8 *buffer)
 }
 
 static bool are_matching_configurations(struct configuration *saved_config,
-					struct geometry *saved_geometry,
+					struct index_geometry *saved_geometry,
 					struct configuration *user)
 {
-	struct geometry *geometry = user->geometry;
+	struct index_geometry *geometry = user->geometry;
 	bool result = true;
 
 	if (saved_geometry->record_pages_per_chapter != geometry->record_pages_per_chapter) {
@@ -97,7 +97,7 @@ int uds_validate_config_contents(struct buffered_reader *reader,
 {
 	int result;
 	struct configuration config;
-	struct geometry geometry;
+	struct index_geometry geometry;
 	u8 version_buffer[INDEX_CONFIG_VERSION_LENGTH];
 	u32 bytes_per_page;
 	u8 buffer[sizeof(struct uds_configuration_6_02)];
@@ -177,7 +177,7 @@ int uds_write_config_contents(struct buffered_writer *writer,
 			      struct configuration *config, u32 version)
 {
 	int result;
-	struct geometry *geometry = config->geometry;
+	struct index_geometry *geometry = config->geometry;
 	u8 buffer[sizeof(struct uds_configuration_8_02)];
 	size_t offset = 0;
 
@@ -331,9 +331,9 @@ int uds_make_configuration(const struct uds_parameters *params,
 	if (result != UDS_SUCCESS)
 		return result;
 
-	result = uds_make_geometry(DEFAULT_BYTES_PER_PAGE, record_pages_per_chapter,
-				   chapters_per_volume, sparse_chapters_per_volume, 0, 0,
-				   &config->geometry);
+	result = uds_make_index_geometry(DEFAULT_BYTES_PER_PAGE, record_pages_per_chapter,
+					 chapters_per_volume, sparse_chapters_per_volume,
+					 0, 0, &config->geometry);
 	if (result != UDS_SUCCESS) {
 		uds_free_configuration(config);
 		return result;
@@ -357,14 +357,14 @@ int uds_make_configuration(const struct uds_parameters *params,
 void uds_free_configuration(struct configuration *config)
 {
 	if (config != NULL) {
-		uds_free_geometry(config->geometry);
+		uds_free_index_geometry(config->geometry);
 		uds_free(config);
 	}
 }
 
 void uds_log_configuration(struct configuration *config)
 {
-	struct geometry *geometry = config->geometry;
+	struct index_geometry *geometry = config->geometry;
 
 	uds_log_debug("Configuration:");
 	uds_log_debug("  Record pages per chapter:   %10u", geometry->record_pages_per_chapter);