diff options
| author | Brian Behlendorf <[email protected]> | 2018-01-19 09:22:37 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-01-19 09:22:37 -0800 |
| commit | 31864e3d8c9fc762d4c30324d9a061f4ed009446 (patch) | |
| tree | aa46e0178efcbd829a3d83a4a9531d4495d45b5a /include/sys/fs/zfs.h | |
| parent | 1574c73bd0680cf3141e26627191120daba3fe8d (diff) | |
OpenZFS 8652 - Tautological comparisons with ZPROP_INVAL
usr/src/uts/common/sys/fs/zfs.h
Change ZPROP_INVAL and ZPROP_CONT from macros to enum values. Clang
and GCC both prefer to use unsigned ints to store enums. That was
causing tautological comparison warnings (and likely eliminating
error handling code at compile time) whenever a zfs_prop_t or
zpool_prop_t was compared to ZPROP_INVAL or ZPROP_CONT. Making the
error flags be explicity enum values forces the enum types to be
signed.
ZPROP_INVAL was also compared against two different enum types. I
had to change its name to ZPOOL_PROP_INVAL whenever its compared to
a zpool_prop_t. There are still some places where ZPROP_INVAL or
ZPROP_CONT is compared to a plain int, in code that doesn't know
whether the int is storing a zfs_prop_t or a zpool_prop_t.
usr/src/uts/common/fs/zfs/spa.c
s/ZPROP_INVAL/ZPOOL_PROP_INVAL/
Authored by: Alan Somers <[email protected]>
Approved by: Gordon Ross <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Igor Kozhukhov <[email protected]>
Reviewed by: George Melikov <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/8652
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c2de80dc74
Closes #7061
Diffstat (limited to 'include/sys/fs/zfs.h')
| -rw-r--r-- | include/sys/fs/zfs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 473e50082..6b1c3bb56 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -88,7 +88,8 @@ typedef enum dmu_objset_type { * the property table in module/zcommon/zfs_prop.c. */ typedef enum { - ZFS_PROP_BAD = -1, + ZPROP_CONT = -2, + ZPROP_INVAL = -1, ZFS_PROP_TYPE = 0, ZFS_PROP_CREATION, ZFS_PROP_USED, @@ -203,6 +204,7 @@ extern const char *zfs_userquota_prop_prefixes[ZFS_NUM_USERQUOTA_PROPS]; * the property table in module/zcommon/zpool_prop.c. */ typedef enum { + ZPOOL_PROP_INVAL = -1, ZPOOL_PROP_NAME, ZPOOL_PROP_SIZE, ZPOOL_PROP_CAPACITY, @@ -238,9 +240,6 @@ typedef enum { /* Small enough to not hog a whole line of printout in zpool(1M). */ #define ZPROP_MAX_COMMENT 32 -#define ZPROP_CONT -2 -#define ZPROP_INVAL -1 - #define ZPROP_VALUE "value" #define ZPROP_SOURCE "source" |