Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

zcommon: *_prop: make all zprop_index_t tables const 

They're already static, and there's no point in them being R/W
and living outside .rodata

Reviewed-by: RageLtMan <rageltman@sempervictus>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12836
This commit is contained in:
наб 2021-12-16 22:26:04 +01:00 committed by GitHub
parent 92a9e8c618
commit 8fdc6f618c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
module/zcommon/zfs_prop.c
View File

@ -74,7 +74,7 @@ zfs_prop_get_table(void)
void void
zfs_prop_init(void) zfs_prop_init(void)
{ {
static zprop_index_t checksum_table[] = { static const zprop_index_t checksum_table[] = {
{ "on", ZIO_CHECKSUM_ON }, { "on", ZIO_CHECKSUM_ON },
{ "off", ZIO_CHECKSUM_OFF }, { "off", ZIO_CHECKSUM_OFF },
{ "fletcher2", ZIO_CHECKSUM_FLETCHER_2 }, { "fletcher2", ZIO_CHECKSUM_FLETCHER_2 },
@ -87,7 +87,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t dedup_table[] = { static const zprop_index_t dedup_table[] = {
{ "on", ZIO_CHECKSUM_ON }, { "on", ZIO_CHECKSUM_ON },
{ "off", ZIO_CHECKSUM_OFF }, { "off", ZIO_CHECKSUM_OFF },
{ "verify", ZIO_CHECKSUM_ON | ZIO_CHECKSUM_VERIFY }, { "verify", ZIO_CHECKSUM_ON | ZIO_CHECKSUM_VERIFY },
@ -105,7 +105,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t compress_table[] = { static const zprop_index_t compress_table[] = {
{ "on", ZIO_COMPRESS_ON }, { "on", ZIO_COMPRESS_ON },
{ "off", ZIO_COMPRESS_OFF }, { "off", ZIO_COMPRESS_OFF },
{ "lzjb", ZIO_COMPRESS_LZJB }, { "lzjb", ZIO_COMPRESS_LZJB },
@ -205,7 +205,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t crypto_table[] = { static const zprop_index_t crypto_table[] = {
{ "on", ZIO_CRYPT_ON }, { "on", ZIO_CRYPT_ON },
{ "off", ZIO_CRYPT_OFF }, { "off", ZIO_CRYPT_OFF },
{ "aes-128-ccm", ZIO_CRYPT_AES_128_CCM }, { "aes-128-ccm", ZIO_CRYPT_AES_128_CCM },
@ -217,7 +217,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t keyformat_table[] = { static const zprop_index_t keyformat_table[] = {
{ "none", ZFS_KEYFORMAT_NONE }, { "none", ZFS_KEYFORMAT_NONE },
{ "raw", ZFS_KEYFORMAT_RAW }, { "raw", ZFS_KEYFORMAT_RAW },
{ "hex", ZFS_KEYFORMAT_HEX }, { "hex", ZFS_KEYFORMAT_HEX },
@ -225,19 +225,19 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t snapdir_table[] = { static const zprop_index_t snapdir_table[] = {
{ "hidden", ZFS_SNAPDIR_HIDDEN }, { "hidden", ZFS_SNAPDIR_HIDDEN },
{ "visible", ZFS_SNAPDIR_VISIBLE }, { "visible", ZFS_SNAPDIR_VISIBLE },
{ NULL } { NULL }
}; };
static zprop_index_t snapdev_table[] = { static const zprop_index_t snapdev_table[] = {
{ "hidden", ZFS_SNAPDEV_HIDDEN }, { "hidden", ZFS_SNAPDEV_HIDDEN },
{ "visible", ZFS_SNAPDEV_VISIBLE }, { "visible", ZFS_SNAPDEV_VISIBLE },
{ NULL } { NULL }
}; };
static zprop_index_t acl_mode_table[] = { static const zprop_index_t acl_mode_table[] = {
{ "discard", ZFS_ACL_DISCARD }, { "discard", ZFS_ACL_DISCARD },
{ "groupmask", ZFS_ACL_GROUPMASK }, { "groupmask", ZFS_ACL_GROUPMASK },
{ "passthrough", ZFS_ACL_PASSTHROUGH }, { "passthrough", ZFS_ACL_PASSTHROUGH },
@ -245,7 +245,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t acltype_table[] = { static const zprop_index_t acltype_table[] = {
{ "off", ZFS_ACLTYPE_OFF }, { "off", ZFS_ACLTYPE_OFF },
{ "posix", ZFS_ACLTYPE_POSIX }, { "posix", ZFS_ACLTYPE_POSIX },
{ "nfsv4", ZFS_ACLTYPE_NFSV4 }, { "nfsv4", ZFS_ACLTYPE_NFSV4 },
@ -255,7 +255,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t acl_inherit_table[] = { static const zprop_index_t acl_inherit_table[] = {
{ "discard", ZFS_ACL_DISCARD }, { "discard", ZFS_ACL_DISCARD },
{ "noallow", ZFS_ACL_NOALLOW }, { "noallow", ZFS_ACL_NOALLOW },
{ "restricted", ZFS_ACL_RESTRICTED }, { "restricted", ZFS_ACL_RESTRICTED },
@ -265,14 +265,14 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t case_table[] = { static const zprop_index_t case_table[] = {
{ "sensitive", ZFS_CASE_SENSITIVE }, { "sensitive", ZFS_CASE_SENSITIVE },
{ "insensitive", ZFS_CASE_INSENSITIVE }, { "insensitive", ZFS_CASE_INSENSITIVE },
{ "mixed", ZFS_CASE_MIXED }, { "mixed", ZFS_CASE_MIXED },
{ NULL } { NULL }
}; };
static zprop_index_t copies_table[] = { static const zprop_index_t copies_table[] = {
{ "1", 1 }, { "1", 1 },
{ "2", 2 }, { "2", 2 },
{ "3", 3 }, { "3", 3 },
@ -284,7 +284,7 @@ zfs_prop_init(void)
* u8_textprep() to represent the various normalization property * u8_textprep() to represent the various normalization property
* values. * values.
*/ */
static zprop_index_t normalize_table[] = { static const zprop_index_t normalize_table[] = {
{ "none", 0 }, { "none", 0 },
{ "formD", U8_TEXTPREP_NFD }, { "formD", U8_TEXTPREP_NFD },
{ "formKC", U8_TEXTPREP_NFKC }, { "formKC", U8_TEXTPREP_NFKC },
@ -293,7 +293,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t version_table[] = { static const zprop_index_t version_table[] = {
{ "1", 1 }, { "1", 1 },
{ "2", 2 }, { "2", 2 },
{ "3", 3 }, { "3", 3 },
@ -303,47 +303,47 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t boolean_table[] = { static const zprop_index_t boolean_table[] = {
{ "off", 0 }, { "off", 0 },
{ "on", 1 }, { "on", 1 },
{ NULL } { NULL }
}; };
static zprop_index_t keystatus_table[] = { static const zprop_index_t keystatus_table[] = {
{ "none", ZFS_KEYSTATUS_NONE}, { "none", ZFS_KEYSTATUS_NONE},
{ "unavailable", ZFS_KEYSTATUS_UNAVAILABLE}, { "unavailable", ZFS_KEYSTATUS_UNAVAILABLE},
{ "available", ZFS_KEYSTATUS_AVAILABLE}, { "available", ZFS_KEYSTATUS_AVAILABLE},
{ NULL } { NULL }
}; };
static zprop_index_t logbias_table[] = { static const zprop_index_t logbias_table[] = {
{ "latency", ZFS_LOGBIAS_LATENCY }, { "latency", ZFS_LOGBIAS_LATENCY },
{ "throughput", ZFS_LOGBIAS_THROUGHPUT }, { "throughput", ZFS_LOGBIAS_THROUGHPUT },
{ NULL } { NULL }
}; };
static zprop_index_t canmount_table[] = { static const zprop_index_t canmount_table[] = {
{ "off", ZFS_CANMOUNT_OFF }, { "off", ZFS_CANMOUNT_OFF },
{ "on", ZFS_CANMOUNT_ON }, { "on", ZFS_CANMOUNT_ON },
{ "noauto", ZFS_CANMOUNT_NOAUTO }, { "noauto", ZFS_CANMOUNT_NOAUTO },
{ NULL } { NULL }
}; };
static zprop_index_t cache_table[] = { static const zprop_index_t cache_table[] = {
{ "none", ZFS_CACHE_NONE }, { "none", ZFS_CACHE_NONE },
{ "metadata", ZFS_CACHE_METADATA }, { "metadata", ZFS_CACHE_METADATA },
{ "all", ZFS_CACHE_ALL }, { "all", ZFS_CACHE_ALL },
{ NULL } { NULL }
}; };
static zprop_index_t sync_table[] = { static const zprop_index_t sync_table[] = {
{ "standard", ZFS_SYNC_STANDARD }, { "standard", ZFS_SYNC_STANDARD },
{ "always", ZFS_SYNC_ALWAYS }, { "always", ZFS_SYNC_ALWAYS },
{ "disabled", ZFS_SYNC_DISABLED }, { "disabled", ZFS_SYNC_DISABLED },
{ NULL } { NULL }
}; };
static zprop_index_t xattr_table[] = { static const zprop_index_t xattr_table[] = {
{ "off", ZFS_XATTR_OFF }, { "off", ZFS_XATTR_OFF },
{ "on", ZFS_XATTR_DIR }, { "on", ZFS_XATTR_DIR },
{ "sa", ZFS_XATTR_SA }, { "sa", ZFS_XATTR_SA },
@ -351,7 +351,7 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t dnsize_table[] = { static const zprop_index_t dnsize_table[] = {
{ "legacy", ZFS_DNSIZE_LEGACY }, { "legacy", ZFS_DNSIZE_LEGACY },
{ "auto", ZFS_DNSIZE_AUTO }, { "auto", ZFS_DNSIZE_AUTO },
{ "1k", ZFS_DNSIZE_1K }, { "1k", ZFS_DNSIZE_1K },
@ -362,13 +362,13 @@ zfs_prop_init(void)
{ NULL } { NULL }
}; };
static zprop_index_t redundant_metadata_table[] = { static const zprop_index_t redundant_metadata_table[] = {
{ "all", ZFS_REDUNDANT_METADATA_ALL }, { "all", ZFS_REDUNDANT_METADATA_ALL },
{ "most", ZFS_REDUNDANT_METADATA_MOST }, { "most", ZFS_REDUNDANT_METADATA_MOST },
{ NULL } { NULL }
}; };
static zprop_index_t volmode_table[] = { static const zprop_index_t volmode_table[] = {
{ "default", ZFS_VOLMODE_DEFAULT }, { "default", ZFS_VOLMODE_DEFAULT },
{ "full", ZFS_VOLMODE_GEOM }, { "full", ZFS_VOLMODE_GEOM },
{ "geom", ZFS_VOLMODE_GEOM }, { "geom", ZFS_VOLMODE_GEOM },

8
module/zcommon/zpool_prop.c
View File

@ -52,13 +52,13 @@ zpool_prop_get_table(void)
void void
zpool_prop_init(void) zpool_prop_init(void)
{ {
static zprop_index_t boolean_table[] = { static const zprop_index_t boolean_table[] = {
{ "off", 0}, { "off", 0},
{ "on", 1}, { "on", 1},
{ NULL } { NULL }
}; };
static zprop_index_t failuremode_table[] = { static const zprop_index_t failuremode_table[] = {
{ "wait", ZIO_FAILURE_MODE_WAIT }, { "wait", ZIO_FAILURE_MODE_WAIT },
{ "continue", ZIO_FAILURE_MODE_CONTINUE }, { "continue", ZIO_FAILURE_MODE_CONTINUE },
{ "panic", ZIO_FAILURE_MODE_PANIC }, { "panic", ZIO_FAILURE_MODE_PANIC },
@ -271,12 +271,12 @@ vdev_prop_get_table(void)
void void
vdev_prop_init(void) vdev_prop_init(void)
{ {
static zprop_index_t boolean_table[] = { static const zprop_index_t boolean_table[] = {
{ "off", 0}, { "off", 0},
{ "on", 1}, { "on", 1},
{ NULL } { NULL }
}; };
static zprop_index_t boolean_na_table[] = { static const zprop_index_t boolean_na_table[] = {
{ "off", 0}, { "off", 0},
{ "on", 1}, { "on", 1},
{ "-", 2}, /* ZPROP_BOOLEAN_NA */ { "-", 2}, /* ZPROP_BOOLEAN_NA */