From 8fdc6f618cf19e1894f5a803e043e80e762a86b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 16 Dec 2021 22:26:04 +0100 Subject: [PATCH] zcommon: *_prop: make all zprop_index_t tables const MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They're already static, and there's no point in them being R/W and living outside .rodata Reviewed-by: RageLtMan Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #12836 --- module/zcommon/zfs_prop.c | 48 ++++++++++++++++++------------------- module/zcommon/zpool_prop.c | 8 +++---- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 2a0e26eca9..592ba8bc32 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -74,7 +74,7 @@ zfs_prop_get_table(void) void zfs_prop_init(void) { - static zprop_index_t checksum_table[] = { + static const zprop_index_t checksum_table[] = { { "on", ZIO_CHECKSUM_ON }, { "off", ZIO_CHECKSUM_OFF }, { "fletcher2", ZIO_CHECKSUM_FLETCHER_2 }, @@ -87,7 +87,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t dedup_table[] = { + static const zprop_index_t dedup_table[] = { { "on", ZIO_CHECKSUM_ON }, { "off", ZIO_CHECKSUM_OFF }, { "verify", ZIO_CHECKSUM_ON | ZIO_CHECKSUM_VERIFY }, @@ -105,7 +105,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t compress_table[] = { + static const zprop_index_t compress_table[] = { { "on", ZIO_COMPRESS_ON }, { "off", ZIO_COMPRESS_OFF }, { "lzjb", ZIO_COMPRESS_LZJB }, @@ -205,7 +205,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t crypto_table[] = { + static const zprop_index_t crypto_table[] = { { "on", ZIO_CRYPT_ON }, { "off", ZIO_CRYPT_OFF }, { "aes-128-ccm", ZIO_CRYPT_AES_128_CCM }, @@ -217,7 +217,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t keyformat_table[] = { + static const zprop_index_t keyformat_table[] = { { "none", ZFS_KEYFORMAT_NONE }, { "raw", ZFS_KEYFORMAT_RAW }, { "hex", ZFS_KEYFORMAT_HEX }, @@ -225,19 +225,19 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t snapdir_table[] = { + static const zprop_index_t snapdir_table[] = { { "hidden", ZFS_SNAPDIR_HIDDEN }, { "visible", ZFS_SNAPDIR_VISIBLE }, { NULL } }; - static zprop_index_t snapdev_table[] = { + static const zprop_index_t snapdev_table[] = { { "hidden", ZFS_SNAPDEV_HIDDEN }, { "visible", ZFS_SNAPDEV_VISIBLE }, { NULL } }; - static zprop_index_t acl_mode_table[] = { + static const zprop_index_t acl_mode_table[] = { { "discard", ZFS_ACL_DISCARD }, { "groupmask", ZFS_ACL_GROUPMASK }, { "passthrough", ZFS_ACL_PASSTHROUGH }, @@ -245,7 +245,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t acltype_table[] = { + static const zprop_index_t acltype_table[] = { { "off", ZFS_ACLTYPE_OFF }, { "posix", ZFS_ACLTYPE_POSIX }, { "nfsv4", ZFS_ACLTYPE_NFSV4 }, @@ -255,7 +255,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t acl_inherit_table[] = { + static const zprop_index_t acl_inherit_table[] = { { "discard", ZFS_ACL_DISCARD }, { "noallow", ZFS_ACL_NOALLOW }, { "restricted", ZFS_ACL_RESTRICTED }, @@ -265,14 +265,14 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t case_table[] = { + static const zprop_index_t case_table[] = { { "sensitive", ZFS_CASE_SENSITIVE }, { "insensitive", ZFS_CASE_INSENSITIVE }, { "mixed", ZFS_CASE_MIXED }, { NULL } }; - static zprop_index_t copies_table[] = { + static const zprop_index_t copies_table[] = { { "1", 1 }, { "2", 2 }, { "3", 3 }, @@ -284,7 +284,7 @@ zfs_prop_init(void) * u8_textprep() to represent the various normalization property * values. */ - static zprop_index_t normalize_table[] = { + static const zprop_index_t normalize_table[] = { { "none", 0 }, { "formD", U8_TEXTPREP_NFD }, { "formKC", U8_TEXTPREP_NFKC }, @@ -293,7 +293,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t version_table[] = { + static const zprop_index_t version_table[] = { { "1", 1 }, { "2", 2 }, { "3", 3 }, @@ -303,47 +303,47 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t boolean_table[] = { + static const zprop_index_t boolean_table[] = { { "off", 0 }, { "on", 1 }, { NULL } }; - static zprop_index_t keystatus_table[] = { + static const zprop_index_t keystatus_table[] = { { "none", ZFS_KEYSTATUS_NONE}, { "unavailable", ZFS_KEYSTATUS_UNAVAILABLE}, { "available", ZFS_KEYSTATUS_AVAILABLE}, { NULL } }; - static zprop_index_t logbias_table[] = { + static const zprop_index_t logbias_table[] = { { "latency", ZFS_LOGBIAS_LATENCY }, { "throughput", ZFS_LOGBIAS_THROUGHPUT }, { NULL } }; - static zprop_index_t canmount_table[] = { + static const zprop_index_t canmount_table[] = { { "off", ZFS_CANMOUNT_OFF }, { "on", ZFS_CANMOUNT_ON }, { "noauto", ZFS_CANMOUNT_NOAUTO }, { NULL } }; - static zprop_index_t cache_table[] = { + static const zprop_index_t cache_table[] = { { "none", ZFS_CACHE_NONE }, { "metadata", ZFS_CACHE_METADATA }, { "all", ZFS_CACHE_ALL }, { NULL } }; - static zprop_index_t sync_table[] = { + static const zprop_index_t sync_table[] = { { "standard", ZFS_SYNC_STANDARD }, { "always", ZFS_SYNC_ALWAYS }, { "disabled", ZFS_SYNC_DISABLED }, { NULL } }; - static zprop_index_t xattr_table[] = { + static const zprop_index_t xattr_table[] = { { "off", ZFS_XATTR_OFF }, { "on", ZFS_XATTR_DIR }, { "sa", ZFS_XATTR_SA }, @@ -351,7 +351,7 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t dnsize_table[] = { + static const zprop_index_t dnsize_table[] = { { "legacy", ZFS_DNSIZE_LEGACY }, { "auto", ZFS_DNSIZE_AUTO }, { "1k", ZFS_DNSIZE_1K }, @@ -362,13 +362,13 @@ zfs_prop_init(void) { NULL } }; - static zprop_index_t redundant_metadata_table[] = { + static const zprop_index_t redundant_metadata_table[] = { { "all", ZFS_REDUNDANT_METADATA_ALL }, { "most", ZFS_REDUNDANT_METADATA_MOST }, { NULL } }; - static zprop_index_t volmode_table[] = { + static const zprop_index_t volmode_table[] = { { "default", ZFS_VOLMODE_DEFAULT }, { "full", ZFS_VOLMODE_GEOM }, { "geom", ZFS_VOLMODE_GEOM }, diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c index 8e7a20e8ef..bfe4ef9adc 100644 --- a/module/zcommon/zpool_prop.c +++ b/module/zcommon/zpool_prop.c @@ -52,13 +52,13 @@ zpool_prop_get_table(void) void zpool_prop_init(void) { - static zprop_index_t boolean_table[] = { + static const zprop_index_t boolean_table[] = { { "off", 0}, { "on", 1}, { NULL } }; - static zprop_index_t failuremode_table[] = { + static const zprop_index_t failuremode_table[] = { { "wait", ZIO_FAILURE_MODE_WAIT }, { "continue", ZIO_FAILURE_MODE_CONTINUE }, { "panic", ZIO_FAILURE_MODE_PANIC }, @@ -271,12 +271,12 @@ vdev_prop_get_table(void) void vdev_prop_init(void) { - static zprop_index_t boolean_table[] = { + static const zprop_index_t boolean_table[] = { { "off", 0}, { "on", 1}, { NULL } }; - static zprop_index_t boolean_na_table[] = { + static const zprop_index_t boolean_na_table[] = { { "off", 0}, { "on", 1}, { "-", 2}, /* ZPROP_BOOLEAN_NA */