diff options
| author | Tim Chase <[email protected]> | 2014-04-21 13:22:08 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-05-06 10:41:46 -0700 |
| commit | 962d52421236fc9cd61d59b4f18cff3276077da9 (patch) | |
| tree | 2e20ebefb0e17c7ff6df4fc797d946934c97d0c9 /include | |
| parent | 1ce0457348aeb26754ced9b575aa374fcd8dff8b (diff) | |
Check the dataset type more rigorously when fetching properties.
When fetching property values of snapshots, a check against the head
dataset type must be performed. Previously, this additional check was
performed only when fetching "version", "normalize", "utf8only" or "case".
This caused the ZPL properties "acltype", "exec", "devices", "nbmand",
"setuid" and "xattr" to be erroneously displayed with meaningless values
for snapshots of volumes. It also did not allow for the display of
"volsize" of a snapshot of a volume.
This patch adds the headcheck flag paramater to zfs_prop_valid_for_type()
and zprop_valid_for_type() to indicate the check is being done
against a head dataset's type in order that properties valid only for
snapshots are handled correctly. This allows the the head check in
get_numeric_property() to be performed when fetching a property for
a snapshot.
Signed-off-by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2265
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/fs/zfs.h | 2 | ||||
| -rw-r--r-- | include/zfs_prop.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index ae72f834d..7b3ae6cff 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -255,7 +255,7 @@ boolean_t zfs_prop_written(const char *); int zfs_prop_index_to_string(zfs_prop_t, uint64_t, const char **); int zfs_prop_string_to_index(zfs_prop_t, const char *, uint64_t *); uint64_t zfs_prop_random_value(zfs_prop_t, uint64_t seed); -boolean_t zfs_prop_valid_for_type(int, zfs_type_t); +boolean_t zfs_prop_valid_for_type(int, zfs_type_t, boolean_t); /* * Pool property functions shared between libzfs and kernel. diff --git a/include/zfs_prop.h b/include/zfs_prop.h index a63262311..5e7d3f55a 100644 --- a/include/zfs_prop.h +++ b/include/zfs_prop.h @@ -120,7 +120,7 @@ int zprop_index_to_string(int, uint64_t, const char **, zfs_type_t); uint64_t zprop_random_value(int, uint64_t, zfs_type_t); const char *zprop_values(int, zfs_type_t); size_t zprop_width(int, boolean_t *, zfs_type_t); -boolean_t zprop_valid_for_type(int, zfs_type_t); +boolean_t zprop_valid_for_type(int, zfs_type_t, boolean_t); #ifdef __cplusplus } |