Skip to content

blob: use uint64_t for cluster start page index #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

blob: use uint64_t for cluster start page index #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/blob/blobstore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2830,7 +2830,7 @@ blob_write_copy(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
}

static bool
blob_can_copy(struct spdk_blob *blob, uint32_t cluster_start_page, uint64_t *base_lba)
blob_can_copy(struct spdk_blob *blob, uint64_t cluster_start_page, uint64_t *base_lba)
{
uint64_t lba = bs_dev_page_to_lba(blob->back_bs_dev, cluster_start_page);

Expand Down Expand Up @@ -2859,7 +2859,7 @@ bs_allocate_and_copy_cluster(struct spdk_blob *blob,
struct spdk_bs_cpl cpl;
struct spdk_bs_channel *ch;
struct spdk_blob_copy_cluster_ctx *ctx;
uint32_t cluster_start_page;
uint64_t cluster_start_page;
uint32_t cluster_number;
bool is_zeroes;
bool can_copy;
Expand Down Expand Up @@ -3296,7 +3296,7 @@ blob_request_submit_op_single(struct spdk_io_channel *_ch, struct spdk_blob *blo
if (spdk_blob_is_thin_provisioned(blob) && is_allocated &&
bs_io_units_per_cluster(blob) == length && g_cluster_unmap_enabled) {
struct spdk_bs_channel *bs_channel = spdk_io_channel_get_ctx(_ch);
uint32_t cluster_start_page;
uint64_t cluster_start_page;
uint32_t cluster_number;

assert(offset % bs_io_units_per_cluster(blob) == 0);
Expand Down
4 changes: 2 additions & 2 deletions lib/blob/blobstore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ bs_num_io_units_to_cluster_boundary(struct spdk_blob *blob, uint64_t io_unit)
}

/* Given an io_unit offset into a blob, look up the number of pages into blob to beginning of current cluster */
static inline uint32_t
static inline uint64_t
bs_io_unit_to_cluster_start(struct spdk_blob *blob, uint64_t io_unit)
{
uint64_t pages_per_cluster;
Expand All @@ -655,7 +655,7 @@ bs_io_unit_to_cluster_number(struct spdk_blob *blob, uint64_t io_unit)
{
uint64_t pages_per_cluster = blob->bs->pages_per_cluster;
uint8_t shift = blob->bs->pages_per_cluster_shift;
uint32_t page_offset;
uint64_t page_offset;

page_offset = io_unit / bs_io_unit_per_page(blob->bs);
if (shift != 0) {
Expand Down