Skip to content

Commit

Permalink
dm vdo: internalize UDS index size computation
Browse files Browse the repository at this point in the history
David Alan Gilbert, upstream, wants to remove this function because
it is not currently used in the kernel. However, UDS unit tests use
it, as well as our userspace tools, so instead we will hide it from
the kernel.

Cf. 29e11586b56a ("dm vdo: Remove unused uds_compute_index_size")

Note that this function will be needed by the vdoformat-in-kernel
story, but in order to make upstreaming that story easier, we
should incorporate this removal now.

Signed-off-by: Matthew Sakai <[email protected]>
  • Loading branch information
lorelei-sakai committed Nov 4, 2024
1 parent c8b07c7 commit df67f0d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
26 changes: 0 additions & 26 deletions drivers/md/dm-vdo/indexer/index-layout.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,32 +248,6 @@ static int __must_check compute_sizes(const struct uds_configuration *config,
return UDS_SUCCESS;
}

int uds_compute_index_size(const struct uds_parameters *parameters, u64 *index_size)
{
int result;
struct uds_configuration *index_config;
struct save_layout_sizes sizes;

if (index_size == NULL) {
vdo_log_error("Missing output size pointer");
return -EINVAL;
}

result = uds_make_configuration(parameters, &index_config);
if (result != UDS_SUCCESS) {
vdo_log_error_strerror(result, "cannot compute index size");
return uds_status_to_errno(result);
}

result = compute_sizes(index_config, &sizes);
uds_free_configuration(index_config);
if (result != UDS_SUCCESS)
return uds_status_to_errno(result);

*index_size = sizes.total_size;
return UDS_SUCCESS;
}

/* Create unique data using the current time and a pseudorandom number. */
static void create_unique_nonce_data(u8 *buffer)
{
Expand Down
4 changes: 0 additions & 4 deletions drivers/md/dm-vdo/indexer/indexer.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,6 @@ struct uds_request {
enum uds_index_region location;
};

/* Compute the number of bytes needed to store an index. */
int __must_check uds_compute_index_size(const struct uds_parameters *parameters,
u64 *index_size);

/* A session is required for most index operations. */
int __must_check uds_create_index_session(struct uds_index_session **session);

Expand Down

0 comments on commit df67f0d

Please sign in to comment.