JSON: fix user properties output for zfs list #16732
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
This commit fixes JSON output for zfs list when user properties are requested with -o flag. This case needed to be handled specifically since zfs_prop_to_name does not return property name for user properties, instead it is stored in pl->pl_user_prop. Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
ixhamza
reviewed
Nov 7, 2024
ixhamza
approved these changes
Nov 7, 2024
amotin
approved these changes
Nov 7, 2024
behlendorf
approved these changes
Nov 7, 2024
behlendorf
added
Status: Accepted
I'll go ahead and merge this fix and we can resolve any other user properties issues with a new PR. |
behlendorf
pushed a commit
to behlendorf/zfs
that referenced
this pull request
Nov 7, 2024
This commit fixes JSON output for zfs list when user properties are requested with -o flag. This case needed to be handled specifically since zfs_prop_to_name does not return property name for user properties, instead it is stored in pl->pl_user_prop. Reviewed-by: Ameer Hamza <ahamza@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Umer Saleem <usaleem@ixsystems.com> Closes openzfs#16732
ixhamza
pushed a commit
to truenas/zfs
that referenced
this pull request
Nov 11, 2024
This commit fixes JSON output for zfs list when user properties are requested with -o flag. This case needed to be handled specifically since zfs_prop_to_name does not return property name for user properties, instead it is stored in pl->pl_user_prop. Reviewed-by: Ameer Hamza <ahamza@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Umer Saleem <usaleem@ixsystems.com> Closes openzfs#16732
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
zfs list -o <user_property>does not output user propertiesDescription
This commit fixes JSON output for
zfs listwhen user properties are requested with-oflag. This case needed to be handled specifically sincezfs_prop_to_namedoes not return property name for user properties, instead it is stored inpl->pl_user_prop.How Has This Been Tested?
Manually tested by setting the user properties and retrieving them in JSON format.
Types of changes
Checklist:
Signed-off-by.