fs: avoid lock acquisition after uring init#7843
Merged
ADD-SP merged 3 commits intotokio-rs:masterfrom Jan 9, 2026
Merged
Conversation
5cf3368 to
825f683
Compare
ADD-SP
reviewed
Jan 8, 2026
ADD-SP
reviewed
Jan 8, 2026
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
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.
Motivation
#7815 added a lock acquisition after the uring had been initialized. This negates the point of the atomic state variable. However, we need to mutably initialize the
Probeonce. This sounds exactly like a use case forOnceCell/OnceLock.Instead of an atomic indicating the uring state, we use a
OnceCell<Option<Probe>>to indicate the uring state:Noneindicating it being unsupported, and theProbeindicating successful initialization. (ThisProbecould later be replaced with any other necessary readonly uring state, but this is currently the only necessary type.)Although we would like to use std's
OnceLock, itsget_or_try_initmethod is currently unstable. We cannot implement it ourselves (as previously present), sinceOnceState::poisonis not public and is necessary to implementget_or_try_init. Hence, I addedonce_cellas a dependency under theio_uringfeature. The 1.65 MSRV should be compatible anyway.