Backport of #13219 and #13220 to the staging branch #13233
Merged
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
Backport of #13219 and #13220 to the staging branch.
Description
b7cbb2f adds missing replay check to an assert in zfs_xvattr_set for FreeBSD.
0c27978 avoids taking a destroyed lock in zfs_event bits for FreeBSD.
How Has This Been Tested?
Manually applied. Pending result from a full CI run.
Types of changes
Checklist:
Signed-off-by
.