[2.2] dbuf: fix assertion ported from master in 9c40ae021 #16005
Conversation
This file contains 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
Signed-off-by: Martin Matuska <[email protected]>
mmatuska
referenced
this pull request
Mar 18, 2024
Block cloning normally creates dirty record without dr_data. But if the block is read after cloning, it is moved into DB_CACHED state and receives the data buffer. If after that we call dbuf_unoverride() to convert the dirty record into normal write, we should give it the data buffer from dbuf and release one. Reviewed-by: Kay Pedersen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Alexander Motin <[email protected]> Sponsored by: iXsystems, Inc. Closes #15654 Closes #15656
|
Not that I have strong objections, but is there any reason not to backport 506fe78 instead to not hit this again at some point? |
I agree, this seems preferable and will likely help pave the way for future backports. |
behlendorf
added
the
Status: Revision Needed
|
Closing. Included in 2.2.4. |
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 and Context
When porting from master 86e115e -> 9c40ae0, the assertion was ported improperly.
The ASSERT0P() is not implemented in 2.2 and we cannot replace it with ASSERT0() as we are checking a pointer.
Description
Fix assertion
How Has This Been Tested?
Compilation with clang and gcc under FreeBSD and Linux
Types of changes
Checklist:
Signed-off-by.