[2.1] freebsd: spa taskq config fixes #15755
Merged
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
tonyhutter
approved these changes
Jan 11, 2024
There was a problem hiding this comment.
Approved, and agree that we should wait for #15719 to merge before merging this PR
Missed in openzfs#15696, backporting openzfs#15675. Signed-off-by: Rob Norris <[email protected]>
sbuf_cpy() resets the sbuf state, which is wrong for sbufs allocated by sbuf_new_for_sysctl(). In particular, this code triggers an assertion failure in sbuf_clear(). Simplify by just using sysctl_handle_string() for both reading and setting the tunable. Fixes: 6930ecb ("spa: make read/write queues configurable") Reviewed-by: Rob Norris <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reported-by: Peter Holm <[email protected]> Signed-off-by: Mark Johnston <[email protected]> Closes openzfs#15719
For FreeBSD sysctls, we don't want the extra newline, since the sysctl(8) utility will format strings appropriately. Reviewed-by: Rob Norris <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reported-by: Peter Holm <[email protected]> Signed-off-by: Mark Johnston <[email protected]> Closes openzfs#15719
Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Mateusz Guzik <[email protected]> Closes openzfs#15036
robn
force-pushed
the
freebsd-spa-taskq-config-compilefix-2.1
branch
from
d78d49c to
13d197b
Compare
|
@tonyhutter thanks! Rebased and re-picked as @behlendorf requested in #15754. |
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
#15754 fixes build for 2.2. This addresses the same thing for 2.1.
Description
Adds the missing change. Also backports #15719, which is approved and I was planning to backport as soon as it landed.
Then it turned out it wouldn't compile on FreeBSD 14 anyway, so also picked #15036 back as well. Seems benign, and comments there suggest a backport to 2.1 anyway.
How Has This Been Tested?
Compile checked on Linux and FreeBSD.
Types of changes
Checklist:
Signed-off-by.