Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 4.14 CONFIG_GCC_PLUGIN_RANDSTRUCT build #6903

Merged
merged 1 commit into from Nov 28, 2017
Merged

Fix 4.14 CONFIG_GCC_PLUGIN_RANDSTRUCT build #6903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions module/icp/io/aes.c
View file
Open in desktop
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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 = {{{{{
Expand Down
28 changes: 14 additions & 14 deletions module/icp/io/sha1_mod.c
View file
Open in desktop
Expand Up @@ -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 *,
Expand All @@ -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,
Expand All @@ -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 = {{{{{
Expand Down
28 changes: 14 additions & 14 deletions module/icp/io/sha2_mod.c
View file
Open in desktop
Expand Up @@ -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 *,
Expand All @@ -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,
Expand All @@ -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 = {{{{{
Expand Down
28 changes: 14 additions & 14 deletions module/icp/io/skein_mod.c
View file
Open in desktop
Expand Up @@ -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 *,
Expand All @@ -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,
Expand All @@ -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 = {{{{{
Expand Down
4 changes: 3 additions & 1 deletion module/icp/os/modconf.c
View file
Open in desktop
Expand Up @@ -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
};

/*
Expand Down
20 changes: 10 additions & 10 deletions module/nvpair/nvpair.c
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions module/nvpair/nvpair_alloc_fixed.c
View file
Open in desktop
Expand Up @@ -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;
Expand Down
30 changes: 15 additions & 15 deletions module/nvpair/nvpair_alloc_spl.c
View file
Open in desktop
Expand Up @@ -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 = {
Expand Down
10 changes: 5 additions & 5 deletions module/zfs/fm.c
View file
Open in desktop
Expand Up @@ -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
};

/*
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/vdev_mirror.c
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/vdev_raidz.c
View file
Open in desktop
Expand Up @@ -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
};

/*
Expand Down