Linux 4.14 compat: CONFIG_GCC_PLUGIN_RANDSTRUCT

Fix build errors with gcc 7.2.0 on Gentoo with kernel 4.14
built with CONFIG_GCC_PLUGIN_RANDSTRUCT=y such as:

module/nvpair/nvpair.c:2810:2:error:
positional initialization of field in ?struct? declared with
'designated_init' attribute [-Werror=designated-init]
  nvs_native_nvlist,
  ^~~~~~~~~~~~~~~~~

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Mark Wright <gienah@gentoo.org>
Closes #5390
Closes #6903

diff --git a/module/icp/io/aes.c b/module/icp/io/aes.c
index 12d57ed79eeeb288a7ff86c972f9cab339e02506..c15931c6f35b290e0bcdef6d14890f55194ca382 100644 (file)
--- a/module/icp/io/aes.c
+++ b/module/icp/io/aes.c
@@ -132,16 +132,16 @@ static int aes_decrypt_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_data_t *, crypto_spi_ctx_template_t, crypto_req_handle_t);
 
 static crypto_cipher_ops_t aes_cipher_ops = {
-       aes_encrypt_init,
-       aes_encrypt,
-       aes_encrypt_update,
-       aes_encrypt_final,
-       aes_encrypt_atomic,
-       aes_decrypt_init,
-       aes_decrypt,
-       aes_decrypt_update,
-       aes_decrypt_final,
-       aes_decrypt_atomic
+       .encrypt_init = aes_encrypt_init,
+       .encrypt = aes_encrypt,
+       .encrypt_update = aes_encrypt_update,
+       .encrypt_final = aes_encrypt_final,
+       .encrypt_atomic = aes_encrypt_atomic,
+       .decrypt_init = aes_decrypt_init,
+       .decrypt = aes_decrypt,
+       .decrypt_update = aes_decrypt_update,
+       .decrypt_final = aes_decrypt_final,
+       .decrypt_atomic = aes_decrypt_atomic
 };
 
 static int aes_mac_atomic(crypto_provider_handle_t, crypto_session_id_t,
@@ -152,12 +152,12 @@ static int aes_mac_verify_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_spi_ctx_template_t, crypto_req_handle_t);
 
 static crypto_mac_ops_t aes_mac_ops = {
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-       aes_mac_atomic,
-       aes_mac_verify_atomic
+       .mac_init = NULL,
+       .mac = NULL,
+       .mac_update = NULL,
+       .mac_final = NULL,
+       .mac_atomic = aes_mac_atomic,
+       .mac_verify_atomic = aes_mac_verify_atomic
 };
 
 static int aes_create_ctx_template(crypto_provider_handle_t,
@@ -166,8 +166,8 @@ static int aes_create_ctx_template(crypto_provider_handle_t,
 static int aes_free_context(crypto_ctx_t *);
 
 static crypto_ctx_ops_t aes_ctx_ops = {
-       aes_create_ctx_template,
-       aes_free_context
+       .create_ctx_template = aes_create_ctx_template,
+       .free_context = aes_free_context
 };
 
 static crypto_ops_t aes_crypto_ops = {{{{{

diff --git a/module/icp/io/sha1_mod.c b/module/icp/io/sha1_mod.c
index a278dac7fc82e6ba38280e9f4cc17ac9207e5d83..a6f4e421ea4b84094b18801e805de93d35394eb7 100644 (file)
--- a/module/icp/io/sha1_mod.c
+++ b/module/icp/io/sha1_mod.c
@@ -115,12 +115,12 @@ static int sha1_digest_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_req_handle_t);
 
 static crypto_digest_ops_t sha1_digest_ops = {
-       sha1_digest_init,
-       sha1_digest,
-       sha1_digest_update,
-       NULL,
-       sha1_digest_final,
-       sha1_digest_atomic
+       .digest_init = sha1_digest_init,
+       .digest = sha1_digest,
+       .digest_update = sha1_digest_update,
+       .digest_key = NULL,
+       .digest_final = sha1_digest_final,
+       .digest_atomic = sha1_digest_atomic
 };
 
 static int sha1_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
@@ -136,12 +136,12 @@ static int sha1_mac_verify_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_spi_ctx_template_t, crypto_req_handle_t);
 
 static crypto_mac_ops_t sha1_mac_ops = {
-       sha1_mac_init,
-       NULL,
-       sha1_mac_update,
-       sha1_mac_final,
-       sha1_mac_atomic,
-       sha1_mac_verify_atomic
+       .mac_init = sha1_mac_init,
+       .mac = NULL,
+       .mac_update = sha1_mac_update,
+       .mac_final = sha1_mac_final,
+       .mac_atomic = sha1_mac_atomic,
+       .mac_verify_atomic = sha1_mac_verify_atomic
 };
 
 static int sha1_create_ctx_template(crypto_provider_handle_t,
@@ -150,8 +150,8 @@ static int sha1_create_ctx_template(crypto_provider_handle_t,
 static int sha1_free_context(crypto_ctx_t *);
 
 static crypto_ctx_ops_t sha1_ctx_ops = {
-       sha1_create_ctx_template,
-       sha1_free_context
+       .create_ctx_template = sha1_create_ctx_template,
+       .free_context = sha1_free_context
 };
 
 static crypto_ops_t sha1_crypto_ops = {{{{{

diff --git a/module/icp/io/sha2_mod.c b/module/icp/io/sha2_mod.c
index 8a3514c80f70da106abad6ad267e9559709158d0..2067404924ab5fcf1bbbeca2bff01f72afb01076 100644 (file)
--- a/module/icp/io/sha2_mod.c
+++ b/module/icp/io/sha2_mod.c
@@ -143,12 +143,12 @@ static int sha2_digest_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_req_handle_t);
 
 static crypto_digest_ops_t sha2_digest_ops = {
-       sha2_digest_init,
-       sha2_digest,
-       sha2_digest_update,
-       NULL,
-       sha2_digest_final,
-       sha2_digest_atomic
+       .digest_init = sha2_digest_init,
+       .digest = sha2_digest,
+       .digest_update = sha2_digest_update,
+       .digest_key = NULL,
+       .digest_final = sha2_digest_final,
+       .digest_atomic = sha2_digest_atomic
 };
 
 static int sha2_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
@@ -164,12 +164,12 @@ static int sha2_mac_verify_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_spi_ctx_template_t, crypto_req_handle_t);
 
 static crypto_mac_ops_t sha2_mac_ops = {
-       sha2_mac_init,
-       NULL,
-       sha2_mac_update,
-       sha2_mac_final,
-       sha2_mac_atomic,
-       sha2_mac_verify_atomic
+       .mac_init = sha2_mac_init,
+       .mac = NULL,
+       .mac_update = sha2_mac_update,
+       .mac_final = sha2_mac_final,
+       .mac_atomic = sha2_mac_atomic,
+       .mac_verify_atomic = sha2_mac_verify_atomic
 };
 
 static int sha2_create_ctx_template(crypto_provider_handle_t,
@@ -178,8 +178,8 @@ static int sha2_create_ctx_template(crypto_provider_handle_t,
 static int sha2_free_context(crypto_ctx_t *);
 
 static crypto_ctx_ops_t sha2_ctx_ops = {
-       sha2_create_ctx_template,
-       sha2_free_context
+       .create_ctx_template = sha2_create_ctx_template,
+       .free_context = sha2_free_context
 };
 
 static crypto_ops_t sha2_crypto_ops = {{{{{

diff --git a/module/icp/io/skein_mod.c b/module/icp/io/skein_mod.c
index 6db31c3559ac9658c077229741e6cb40aa0a33c5..90e8a6a0252b16563a3ac0ef0f5d46dff0d64c25 100644 (file)
--- a/module/icp/io/skein_mod.c
+++ b/module/icp/io/skein_mod.c
@@ -88,12 +88,12 @@ static int skein_digest_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_req_handle_t);
 
 static crypto_digest_ops_t skein_digest_ops = {
-       skein_digest_init,
-       skein_digest,
-       skein_update,
-       NULL,
-       skein_final,
-       skein_digest_atomic
+       .digest_init = skein_digest_init,
+       .digest = skein_digest,
+       .digest_update = skein_update,
+       .digest_key = NULL,
+       .digest_final = skein_final,
+       .digest_atomic = skein_digest_atomic
 };
 
 static int skein_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
@@ -103,12 +103,12 @@ static int skein_mac_atomic(crypto_provider_handle_t, crypto_session_id_t,
     crypto_spi_ctx_template_t, crypto_req_handle_t);
 
 static crypto_mac_ops_t skein_mac_ops = {
-       skein_mac_init,
-       NULL,
-       skein_update,   /* using regular digest update is OK here */
-       skein_final,    /* using regular digest final is OK here */
-       skein_mac_atomic,
-       NULL
+       .mac_init = skein_mac_init,
+       .mac = NULL,
+       .mac_update = skein_update, /* using regular digest update is OK here */
+       .mac_final = skein_final,   /* using regular digest final is OK here */
+       .mac_atomic = skein_mac_atomic,
+       .mac_verify_atomic = NULL
 };
 
 static int skein_create_ctx_template(crypto_provider_handle_t,
@@ -117,8 +117,8 @@ static int skein_create_ctx_template(crypto_provider_handle_t,
 static int skein_free_context(crypto_ctx_t *);
 
 static crypto_ctx_ops_t skein_ctx_ops = {
-       skein_create_ctx_template,
-       skein_free_context
+       .create_ctx_template = skein_create_ctx_template,
+       .free_context = skein_free_context
 };
 
 static crypto_ops_t skein_crypto_ops = {{{{{

diff --git a/module/icp/os/modconf.c b/module/icp/os/modconf.c
index eb50767b74d80773a90d6eb6f2786ee68a91e74f..3743416ed951cf6dc6e71e1e30d5502065d1f8bc 100644 (file)
--- a/module/icp/os/modconf.c
+++ b/module/icp/os/modconf.c
@@ -36,7 +36,9 @@ static int mod_infonull(void *, struct modlinkage *, int *);
  * Cryptographic Modules
  */
 struct mod_ops mod_cryptoops = {
-       mod_null, mod_null, mod_infonull
+       .modm_install = mod_null,
+       .modm_remove = mod_null,
+       .modm_info = mod_infonull
 };
 
 /*

diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index 5ce389f142b3410c7c6772d71baed6f19b8a877f..512f9a998426c85f1b6d73de0051fe3c4d10825c 100644 (file)
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -2807,11 +2807,11 @@ nvs_native_nvpair(nvstream_t *nvs, nvpair_t *nvp, size_t *size)
 }
 
 static const nvs_ops_t nvs_native_ops = {
-       nvs_native_nvlist,
-       nvs_native_nvpair,
-       nvs_native_nvp_op,
-       nvs_native_nvp_size,
-       nvs_native_nvl_fini
+       .nvs_nvlist = nvs_native_nvlist,
+       .nvs_nvpair = nvs_native_nvpair,
+       .nvs_nvp_op = nvs_native_nvp_op,
+       .nvs_nvp_size = nvs_native_nvp_size,
+       .nvs_nvl_fini = nvs_native_nvl_fini
 };
 
 static int
@@ -3294,11 +3294,11 @@ nvs_xdr_nvpair(nvstream_t *nvs, nvpair_t *nvp, size_t *size)
 }
 
 static const struct nvs_ops nvs_xdr_ops = {
-       nvs_xdr_nvlist,
-       nvs_xdr_nvpair,
-       nvs_xdr_nvp_op,
-       nvs_xdr_nvp_size,
-       nvs_xdr_nvl_fini
+       .nvs_nvlist = nvs_xdr_nvlist,
+       .nvs_nvpair = nvs_xdr_nvpair,
+       .nvs_nvp_op = nvs_xdr_nvp_op,
+       .nvs_nvp_size = nvs_xdr_nvp_size,
+       .nvs_nvl_fini = nvs_xdr_nvl_fini
 };
 
 static int

diff --git a/module/nvpair/nvpair_alloc_fixed.c b/module/nvpair/nvpair_alloc_fixed.c
index e3ac12938defeb1ed66bed920b2a4b7e05fb0467..0d4e12b972bb88788658850db001bef91e725854 100644 (file)
--- a/module/nvpair/nvpair_alloc_fixed.c
+++ b/module/nvpair/nvpair_alloc_fixed.c
@@ -110,11 +110,11 @@ nv_fixed_reset(nv_alloc_t *nva)
 }
 
 const nv_alloc_ops_t nv_fixed_ops_def = {
-       nv_fixed_init,  /* nv_ao_init() */
-       NULL,           /* nv_ao_fini() */
-       nv_fixed_alloc, /* nv_ao_alloc() */
-       nv_fixed_free,  /* nv_ao_free() */
-       nv_fixed_reset  /* nv_ao_reset() */
+       .nv_ao_init = nv_fixed_init,
+       .nv_ao_fini = NULL,
+       .nv_ao_alloc = nv_fixed_alloc,
+       .nv_ao_free = nv_fixed_free,
+       .nv_ao_reset = nv_fixed_reset
 };
 
 const nv_alloc_ops_t *nv_fixed_ops = &nv_fixed_ops_def;

diff --git a/module/nvpair/nvpair_alloc_spl.c b/module/nvpair/nvpair_alloc_spl.c
index bc377ab662570a4e6fa2fa0acf3b19d4a58cd51f..ed8fa4d09402de4554c3f6a6f133c8b3693bc340 100644 (file)
--- a/module/nvpair/nvpair_alloc_spl.c
+++ b/module/nvpair/nvpair_alloc_spl.c
@@ -53,27 +53,27 @@ nv_free_spl(nv_alloc_t *nva, void *buf, size_t size)
 }
 
 const nv_alloc_ops_t spl_sleep_ops_def = {
-       NULL,                   /* nv_ao_init() */
-       NULL,                   /* nv_ao_fini() */
-       nv_alloc_sleep_spl,     /* nv_ao_alloc() */
-       nv_free_spl,            /* nv_ao_free() */
-       NULL                    /* nv_ao_reset() */
+       .nv_ao_init = NULL,
+       .nv_ao_fini = NULL,
+       .nv_ao_alloc = nv_alloc_sleep_spl,
+       .nv_ao_free = nv_free_spl,
+       .nv_ao_reset = NULL
 };
 
 const nv_alloc_ops_t spl_pushpage_ops_def = {
-       NULL,                   /* nv_ao_init() */
-       NULL,                   /* nv_ao_fini() */
-       nv_alloc_pushpage_spl,  /* nv_ao_alloc() */
-       nv_free_spl,            /* nv_ao_free() */
-       NULL                    /* nv_ao_reset() */
+       .nv_ao_init = NULL,
+       .nv_ao_fini = NULL,
+       .nv_ao_alloc = nv_alloc_pushpage_spl,
+       .nv_ao_free = nv_free_spl,
+       .nv_ao_reset = NULL
 };
 
 const nv_alloc_ops_t spl_nosleep_ops_def = {
-       NULL,                   /* nv_ao_init() */
-       NULL,                   /* nv_ao_fini() */
-       nv_alloc_nosleep_spl,   /* nv_ao_alloc() */
-       nv_free_spl,            /* nv_ao_free() */
-       NULL                    /* nv_ao_reset() */
+       .nv_ao_init = NULL,
+       .nv_ao_fini = NULL,
+       .nv_ao_alloc = nv_alloc_nosleep_spl,
+       .nv_ao_free = nv_free_spl,
+       .nv_ao_reset = NULL
 };
 
 nv_alloc_t nv_alloc_sleep_def = {

diff --git a/module/zfs/fm.c b/module/zfs/fm.c
index 00ac20df6162c268f4ea444581a6ae663687aaef..52d4acaa23ed2a82387068ef654e07ee0ebcb887 100644 (file)
--- a/module/zfs/fm.c
+++ b/module/zfs/fm.c
@@ -794,11 +794,11 @@ i_fm_free(nv_alloc_t *nva, void *buf, size_t size)
 }
 
 const nv_alloc_ops_t fm_mem_alloc_ops = {
-       NULL,
-       NULL,
-       i_fm_alloc,
-       i_fm_free,
-       NULL
+       .nv_ao_init = NULL,
+       .nv_ao_fini = NULL,
+       .nv_ao_alloc = i_fm_alloc,
+       .nv_ao_free = i_fm_free,
+       .nv_ao_reset = NULL
 };
 
 /*

diff --git a/module/zfs/vdev_mirror.c b/module/zfs/vdev_mirror.c
index 804628235d6f3c8249533d51a38372b47c4bafb5..1d5adce178b9397051dd71a4fe779e40787ea074 100644 (file)
--- a/module/zfs/vdev_mirror.c
+++ b/module/zfs/vdev_mirror.c
@@ -168,8 +168,8 @@ vdev_mirror_map_free(zio_t *zio)
 }
 
 static const zio_vsd_ops_t vdev_mirror_vsd_ops = {
-       vdev_mirror_map_free,
-       zio_vsd_default_cksum_report
+       .vsd_free = vdev_mirror_map_free,
+       .vsd_cksum_report = zio_vsd_default_cksum_report
 };
 
 static int

diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c
index ed764add83e445b2ae619a9543636201f742ea56..ef81af6f7716724ebd7c2827881bed522f88fef3 100644 (file)
--- a/module/zfs/vdev_raidz.c
+++ b/module/zfs/vdev_raidz.c
@@ -318,8 +318,8 @@ vdev_raidz_cksum_report(zio_t *zio, zio_cksum_report_t *zcr, void *arg)
 }
 
 static const zio_vsd_ops_t vdev_raidz_vsd_ops = {
-       vdev_raidz_map_free_vsd,
-       vdev_raidz_cksum_report
+       .vsd_free = vdev_raidz_map_free_vsd,
+       .vsd_cksum_report = vdev_raidz_cksum_report
 };
 
 /*

diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c
index ae9ae33bcf76c580ee8552a41b8e857532c38f13..71a837a355740bbd5ea89ea6294a81e31c4a0b2d 100644 (file)
--- a/module/zfs/zfs_acl.c
+++ b/module/zfs/zfs_acl.c
@@ -174,18 +174,18 @@ zfs_ace_v0_data(void *acep, void **datap)
 }
 
 static acl_ops_t zfs_acl_v0_ops = {
-       zfs_ace_v0_get_mask,
-       zfs_ace_v0_set_mask,
-       zfs_ace_v0_get_flags,
-       zfs_ace_v0_set_flags,
-       zfs_ace_v0_get_type,
-       zfs_ace_v0_set_type,
-       zfs_ace_v0_get_who,
-       zfs_ace_v0_set_who,
-       zfs_ace_v0_size,
-       zfs_ace_v0_abstract_size,
-       zfs_ace_v0_mask_off,
-       zfs_ace_v0_data
+       .ace_mask_get = zfs_ace_v0_get_mask,
+       .ace_mask_set = zfs_ace_v0_set_mask,
+       .ace_flags_get = zfs_ace_v0_get_flags,
+       .ace_flags_set = zfs_ace_v0_set_flags,
+       .ace_type_get = zfs_ace_v0_get_type,
+       .ace_type_set = zfs_ace_v0_set_type,
+       .ace_who_get = zfs_ace_v0_get_who,
+       .ace_who_set = zfs_ace_v0_set_who,
+       .ace_size = zfs_ace_v0_size,
+       .ace_abstract_size = zfs_ace_v0_abstract_size,
+       .ace_mask_off = zfs_ace_v0_mask_off,
+       .ace_data = zfs_ace_v0_data
 };
 
 static uint16_t
@@ -310,18 +310,18 @@ zfs_ace_fuid_data(void *acep, void **datap)
 }
 
 static acl_ops_t zfs_acl_fuid_ops = {
-       zfs_ace_fuid_get_mask,
-       zfs_ace_fuid_set_mask,
-       zfs_ace_fuid_get_flags,
-       zfs_ace_fuid_set_flags,
-       zfs_ace_fuid_get_type,
-       zfs_ace_fuid_set_type,
-       zfs_ace_fuid_get_who,
-       zfs_ace_fuid_set_who,
-       zfs_ace_fuid_size,
-       zfs_ace_fuid_abstract_size,
-       zfs_ace_fuid_mask_off,
-       zfs_ace_fuid_data
+       .ace_mask_get = zfs_ace_fuid_get_mask,
+       .ace_mask_set = zfs_ace_fuid_set_mask,
+       .ace_flags_get = zfs_ace_fuid_get_flags,
+       .ace_flags_set = zfs_ace_fuid_set_flags,
+       .ace_type_get = zfs_ace_fuid_get_type,
+       .ace_type_set = zfs_ace_fuid_set_type,
+       .ace_who_get = zfs_ace_fuid_get_who,
+       .ace_who_set = zfs_ace_fuid_set_who,
+       .ace_size = zfs_ace_fuid_size,
+       .ace_abstract_size = zfs_ace_fuid_abstract_size,
+       .ace_mask_off = zfs_ace_fuid_mask_off,
+       .ace_data = zfs_ace_fuid_data
 };
 
 /*