Merged
Conversation
This was referenced Jan 23, 2024
jmpesp
approved these changes
Jan 24, 2024
pantry/src/pantry.rs
Outdated
| } | ||
| if Self::MAX_CHUNK_SIZE % block_size as usize != 0 { | ||
| crucible_bail!( | ||
| InvalidNumberOfBlocks, |
Contributor
There was a problem hiding this comment.
Maybe should be
#[error("Data length not block size multiple")]
DataLenUnaligned,?
Contributor
Author
There was a problem hiding this comment.
I added static assertions relating MAX_CHUNK_SIZE and MAX_BLOCK_SIZE, so this should always be true and I switched it to an assertion (4c2c657)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR changes the
struct Bufferto enforce that it is always an exact multiple of blocks.The property is enforced at construction: the only way to build or resize a
Bufferis to provide a tuple of(block_count, block_size). Various implementors ofBlockIOalso now check that their reads and writes are block-aligned, returning the existingCrucibleError::DataLenUnalignedif that's not the case.These changes are a step towards per-block ownership, but make sense as a standalone PR: