randstruct.patch

   1 diff -ur -x Makefile.in zfs-0.7.3/module/icp/io/aes.c zfs-0.7.3-randstruct/module/icp/io/aes.c
   2 --- zfs-0.7.3/module/icp/io/aes.c       2017-10-18 23:47:55.000000000 +0200
   3 +++ zfs-0.7.3-randstruct/module/icp/io/aes.c    2017-11-18 14:27:50.736864845 +0100
   4 @@ -132,16 +132,16 @@
   5      crypto_data_t *, crypto_spi_ctx_template_t, crypto_req_handle_t);
   6
   7  static crypto_cipher_ops_t aes_cipher_ops = {
   8 -       aes_encrypt_init,
   9 -       aes_encrypt,
  10 -       aes_encrypt_update,
  11 -       aes_encrypt_final,
  12 -       aes_encrypt_atomic,
  13 -       aes_decrypt_init,
  14 -       aes_decrypt,
  15 -       aes_decrypt_update,
  16 -       aes_decrypt_final,
  17 -       aes_decrypt_atomic
  18 +       .encrypt_init =   aes_encrypt_init,
  19 +       .encrypt =        aes_encrypt,
  20 +       .encrypt_update = aes_encrypt_update,
  21 +       .encrypt_final =  aes_encrypt_final,
  22 +       .encrypt_atomic = aes_encrypt_atomic,
  23 +       .decrypt_init =   aes_decrypt_init,
  24 +       .decrypt =        aes_decrypt,
  25 +       .decrypt_update = aes_decrypt_update,
  26 +       .decrypt_final =  aes_decrypt_final,
  27 +       .decrypt_atomic = aes_decrypt_atomic
  28  };
  29
  30  static int aes_mac_atomic(crypto_provider_handle_t, crypto_session_id_t,
  31 @@ -152,12 +152,8 @@
  32      crypto_spi_ctx_template_t, crypto_req_handle_t);
  33
  34  static crypto_mac_ops_t aes_mac_ops = {
  35 -       NULL,
  36 -       NULL,
  37 -       NULL,
  38 -       NULL,
  39 -       aes_mac_atomic,
  40 -       aes_mac_verify_atomic
  41 +       .mac_atomic = aes_mac_atomic,
  42 +       .mac_verify_atomic = aes_mac_verify_atomic
  43  };
  44
  45  static int aes_create_ctx_template(crypto_provider_handle_t,
  46 @@ -166,25 +162,19 @@
  47  static int aes_free_context(crypto_ctx_t *);
  48
  49  static crypto_ctx_ops_t aes_ctx_ops = {
  50 -       aes_create_ctx_template,
  51 -       aes_free_context
  52 +       .create_ctx_template = aes_create_ctx_template,
  53 +       .free_context = aes_free_context
  54  };
  55
  56 +#undef co_control_ops
  57 +#undef co_cipher_ops
  58 +#undef co_mac_ops
  59 +#undef co_ctx_ops
  60  static crypto_ops_t aes_crypto_ops = {{{{{
  61 -       &aes_control_ops,
  62 -       NULL,
  63 -       &aes_cipher_ops,
  64 -       &aes_mac_ops,
  65 -       NULL,
  66 -       NULL,
  67 -       NULL,
  68 -       NULL,
  69 -       NULL,
  70 -       NULL,
  71 -       NULL,
  72 -       NULL,
  73 -       NULL,
  74 -       &aes_ctx_ops
  75 +       .co_control_ops = &aes_control_ops,
  76 +       .co_cipher_ops  = &aes_cipher_ops,
  77 +       .co_mac_ops     = &aes_mac_ops,
  78 +       .co_ctx_ops     = &aes_ctx_ops
  79  }}}}};
  80
  81  static crypto_provider_info_t aes_prov_info = {{{{
  82 diff -ur -x Makefile.in zfs-0.7.3/module/icp/io/sha1_mod.c zfs-0.7.3-randstruct/module/icp/io/sha1_mod.c
  83 --- zfs-0.7.3/module/icp/io/sha1_mod.c  2017-10-18 23:47:55.000000000 +0200
  84 +++ zfs-0.7.3-randstruct/module/icp/io/sha1_mod.c       2017-11-18 14:32:59.798477403 +0100
  85 @@ -115,12 +115,11 @@
  86      crypto_req_handle_t);
  87
  88  static crypto_digest_ops_t sha1_digest_ops = {
  89 -       sha1_digest_init,
  90 -       sha1_digest,
  91 -       sha1_digest_update,
  92 -       NULL,
  93 -       sha1_digest_final,
  94 -       sha1_digest_atomic
  95 +       .digest_init   = sha1_digest_init,
  96 +       .digest        = sha1_digest,
  97 +       .digest_update = sha1_digest_update,
  98 +       .digest_final  = sha1_digest_final,
  99 +       .digest_atomic = sha1_digest_atomic
 100  };
 101
 102  static int sha1_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
 103 @@ -136,12 +135,11 @@
 104      crypto_spi_ctx_template_t, crypto_req_handle_t);
 105
 106  static crypto_mac_ops_t sha1_mac_ops = {
 107 -       sha1_mac_init,
 108 -       NULL,
 109 -       sha1_mac_update,
 110 -       sha1_mac_final,
 111 -       sha1_mac_atomic,
 112 -       sha1_mac_verify_atomic
 113 +       .mac_init          = sha1_mac_init,
 114 +       .mac_update        = sha1_mac_update,
 115 +       .mac_final         = sha1_mac_final,
 116 +       .mac_atomic        = sha1_mac_atomic,
 117 +       .mac_verify_atomic = sha1_mac_verify_atomic
 118  };
 119
 120  static int sha1_create_ctx_template(crypto_provider_handle_t,
 121 @@ -150,25 +148,19 @@
 122  static int sha1_free_context(crypto_ctx_t *);
 123
 124  static crypto_ctx_ops_t sha1_ctx_ops = {
 125 -       sha1_create_ctx_template,
 126 -       sha1_free_context
 127 +       .create_ctx_template = sha1_create_ctx_template,
 128 +       .free_context = sha1_free_context
 129  };
 130
 131 +#undef co_control_ops
 132 +#undef co_digest_ops
 133 +#undef co_mac_ops
 134 +#undef co_ctx_ops
 135  static crypto_ops_t sha1_crypto_ops = {{{{{
 136 -       &sha1_control_ops,
 137 -       &sha1_digest_ops,
 138 -       NULL,
 139 -       &sha1_mac_ops,
 140 -       NULL,
 141 -       NULL,
 142 -       NULL,
 143 -       NULL,
 144 -       NULL,
 145 -       NULL,
 146 -       NULL,
 147 -       NULL,
 148 -       NULL,
 149 -       &sha1_ctx_ops,
 150 +       .co_control_ops = &sha1_control_ops,
 151 +       .co_digest_ops  = &sha1_digest_ops,
 152 +       .co_mac_ops     = &sha1_mac_ops,
 153 +       .co_ctx_ops     = &sha1_ctx_ops,
 154  }}}}};
 155
 156  static crypto_provider_info_t sha1_prov_info = {{{{
 157 diff -ur -x Makefile.in zfs-0.7.3/module/icp/io/sha2_mod.c zfs-0.7.3-randstruct/module/icp/io/sha2_mod.c
 158 --- zfs-0.7.3/module/icp/io/sha2_mod.c  2017-10-18 23:47:55.000000000 +0200
 159 +++ zfs-0.7.3-randstruct/module/icp/io/sha2_mod.c       2017-11-18 14:36:27.081039215 +0100
 160 @@ -143,12 +143,11 @@
 161      crypto_req_handle_t);
 162
 163  static crypto_digest_ops_t sha2_digest_ops = {
 164 -       sha2_digest_init,
 165 -       sha2_digest,
 166 -       sha2_digest_update,
 167 -       NULL,
 168 -       sha2_digest_final,
 169 -       sha2_digest_atomic
 170 +       .digest_init   = sha2_digest_init,
 171 +       .digest        = sha2_digest,
 172 +       .digest_update = sha2_digest_update,
 173 +       .digest_final  = sha2_digest_final,
 174 +       .digest_atomic = sha2_digest_atomic
 175  };
 176
 177  static int sha2_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
 178 @@ -164,12 +163,11 @@
 179      crypto_spi_ctx_template_t, crypto_req_handle_t);
 180
 181  static crypto_mac_ops_t sha2_mac_ops = {
 182 -       sha2_mac_init,
 183 -       NULL,
 184 -       sha2_mac_update,
 185 -       sha2_mac_final,
 186 -       sha2_mac_atomic,
 187 -       sha2_mac_verify_atomic
 188 +       .mac_init          = sha2_mac_init,
 189 +       .mac_update        = sha2_mac_update,
 190 +       .mac_final         = sha2_mac_final,
 191 +       .mac_atomic        = sha2_mac_atomic,
 192 +       .mac_verify_atomic = sha2_mac_verify_atomic
 193  };
 194
 195  static int sha2_create_ctx_template(crypto_provider_handle_t,
 196 @@ -178,25 +176,19 @@
 197  static int sha2_free_context(crypto_ctx_t *);
 198
 199  static crypto_ctx_ops_t sha2_ctx_ops = {
 200 -       sha2_create_ctx_template,
 201 -       sha2_free_context
 202 +       .create_ctx_template = sha2_create_ctx_template,
 203 +       .free_context = sha2_free_context
 204  };
 205
 206 +#undef co_control_ops
 207 +#undef co_digest_ops
 208 +#undef co_mac_ops
 209 +#undef co_ctx_ops
 210  static crypto_ops_t sha2_crypto_ops = {{{{{
 211 -       &sha2_control_ops,
 212 -       &sha2_digest_ops,
 213 -       NULL,
 214 -       &sha2_mac_ops,
 215 -       NULL,
 216 -       NULL,
 217 -       NULL,
 218 -       NULL,
 219 -       NULL,
 220 -       NULL,
 221 -       NULL,
 222 -       NULL,
 223 -       NULL,
 224 -       &sha2_ctx_ops
 225 +       .co_control_ops = &sha2_control_ops,
 226 +       .co_digest_ops = &sha2_digest_ops,
 227 +       .co_mac_ops = &sha2_mac_ops,
 228 +       .co_ctx_ops = &sha2_ctx_ops
 229  }}}}};
 230
 231  static crypto_provider_info_t sha2_prov_info = {{{{
 232 diff -ur -x Makefile.in zfs-0.7.3/module/icp/io/skein_mod.c zfs-0.7.3-randstruct/module/icp/io/skein_mod.c
 233 --- zfs-0.7.3/module/icp/io/skein_mod.c 2017-10-18 23:47:55.000000000 +0200
 234 +++ zfs-0.7.3-randstruct/module/icp/io/skein_mod.c      2017-11-18 14:39:32.882976968 +0100
 235 @@ -88,12 +88,11 @@
 236      crypto_req_handle_t);
 237
 238  static crypto_digest_ops_t skein_digest_ops = {
 239 -       skein_digest_init,
 240 -       skein_digest,
 241 -       skein_update,
 242 -       NULL,
 243 -       skein_final,
 244 -       skein_digest_atomic
 245 +       .digest_init   = skein_digest_init,
 246 +       .digest        = skein_digest,
 247 +       .digest_update = skein_update,
 248 +       .digest_final  = skein_final,
 249 +       .digest_atomic = skein_digest_atomic
 250  };
 251
 252  static int skein_mac_init(crypto_ctx_t *, crypto_mechanism_t *, crypto_key_t *,
 253 @@ -103,12 +102,10 @@
 254      crypto_spi_ctx_template_t, crypto_req_handle_t);
 255
 256  static crypto_mac_ops_t skein_mac_ops = {
 257 -       skein_mac_init,
 258 -       NULL,
 259 -       skein_update,   /* using regular digest update is OK here */
 260 -       skein_final,    /* using regular digest final is OK here */
 261 -       skein_mac_atomic,
 262 -       NULL
 263 +       .mac_init   = skein_mac_init,
 264 +       .mac_update = skein_update,     /* using regular digest update is OK here */
 265 +       .mac_final  = skein_final,      /* using regular digest final is OK here */
 266 +       .mac_atomic = skein_mac_atomic,
 267  };
 268
 269  static int skein_create_ctx_template(crypto_provider_handle_t,
 270 @@ -117,25 +114,19 @@
 271  static int skein_free_context(crypto_ctx_t *);
 272
 273  static crypto_ctx_ops_t skein_ctx_ops = {
 274 -       skein_create_ctx_template,
 275 -       skein_free_context
 276 +       .create_ctx_template = skein_create_ctx_template,
 277 +       .free_context = skein_free_context
 278  };
 279
 280 +#undef co_control_ops
 281 +#undef co_digest_ops
 282 +#undef co_mac_ops
 283 +#undef co_ctx_ops
 284  static crypto_ops_t skein_crypto_ops = {{{{{
 285 -       &skein_control_ops,
 286 -       &skein_digest_ops,
 287 -       NULL,
 288 -       &skein_mac_ops,
 289 -       NULL,
 290 -       NULL,
 291 -       NULL,
 292 -       NULL,
 293 -       NULL,
 294 -       NULL,
 295 -       NULL,
 296 -       NULL,
 297 -       NULL,
 298 -       &skein_ctx_ops,
 299 +       .co_control_ops = &skein_control_ops,
 300 +       .co_digest_ops  = &skein_digest_ops,
 301 +       .co_mac_ops     = &skein_mac_ops,
 302 +       .co_ctx_ops     = &skein_ctx_ops,
 303  }}}}};
 304
 305  static crypto_provider_info_t skein_prov_info = {{{{
 306 diff -ur -x Makefile.in zfs-0.7.3/module/icp/os/modconf.c zfs-0.7.3-randstruct/module/icp/os/modconf.c
 307 --- zfs-0.7.3/module/icp/os/modconf.c   2017-10-18 23:47:55.000000000 +0200
 308 +++ zfs-0.7.3-randstruct/module/icp/os/modconf.c        2017-11-18 14:41:58.243714079 +0100
 309 @@ -36,7 +36,9 @@
 310   * Cryptographic Modules
 311   */
 312  struct mod_ops mod_cryptoops = {
 313 -       mod_null, mod_null, mod_infonull
 314 +       .modm_install = mod_null,
 315 +       .modm_remove = mod_null,
 316 +       .modm_info = mod_infonull
 317  };
 318
 319  /*
 320 diff -ur -x Makefile.in zfs-0.7.3/module/nvpair/nvpair_alloc_fixed.c zfs-0.7.3-randstruct/module/nvpair/nvpair_alloc_fixed.c
 321 --- zfs-0.7.3/module/nvpair/nvpair_alloc_fixed.c        2017-10-18 23:47:55.000000000 +0200
 322 +++ zfs-0.7.3-randstruct/module/nvpair/nvpair_alloc_fixed.c     2017-11-18 13:47:40.722198859 +0100
 323 @@ -110,11 +110,10 @@
 324  }
 325
 326  const nv_alloc_ops_t nv_fixed_ops_def = {
 327 -       nv_fixed_init,  /* nv_ao_init() */
 328 -       NULL,           /* nv_ao_fini() */
 329 -       nv_fixed_alloc, /* nv_ao_alloc() */
 330 -       nv_fixed_free,  /* nv_ao_free() */
 331 -       nv_fixed_reset  /* nv_ao_reset() */
 332 +       .nv_ao_init  = nv_fixed_init,   /* nv_ao_init() */
 333 +       .nv_ao_alloc = nv_fixed_alloc,  /* nv_ao_alloc() */
 334 +       .nv_ao_free  = nv_fixed_free,   /* nv_ao_free() */
 335 +       .nv_ao_reset = nv_fixed_reset   /* nv_ao_reset() */
 336  };
 337
 338  const nv_alloc_ops_t *nv_fixed_ops = &nv_fixed_ops_def;
 339 diff -ur -x Makefile.in zfs-0.7.3/module/nvpair/nvpair_alloc_spl.c zfs-0.7.3-randstruct/module/nvpair/nvpair_alloc_spl.c
 340 --- zfs-0.7.3/module/nvpair/nvpair_alloc_spl.c  2017-10-18 23:47:55.000000000 +0200
 341 +++ zfs-0.7.3-randstruct/module/nvpair/nvpair_alloc_spl.c       2017-11-18 13:44:13.936668708 +0100
 342 @@ -53,42 +53,30 @@
 343  }
 344
 345  const nv_alloc_ops_t spl_sleep_ops_def = {
 346 -       NULL,                   /* nv_ao_init() */
 347 -       NULL,                   /* nv_ao_fini() */
 348 -       nv_alloc_sleep_spl,     /* nv_ao_alloc() */
 349 -       nv_free_spl,            /* nv_ao_free() */
 350 -       NULL                    /* nv_ao_reset() */
 351 +       .nv_ao_alloc = nv_alloc_sleep_spl,      /* nv_ao_alloc() */
 352 +       .nv_ao_free = nv_free_spl,              /* nv_ao_free() */
 353  };
 354
 355  const nv_alloc_ops_t spl_pushpage_ops_def = {
 356 -       NULL,                   /* nv_ao_init() */
 357 -       NULL,                   /* nv_ao_fini() */
 358 -       nv_alloc_pushpage_spl,  /* nv_ao_alloc() */
 359 -       nv_free_spl,            /* nv_ao_free() */
 360 -       NULL                    /* nv_ao_reset() */
 361 +       .nv_ao_alloc = nv_alloc_pushpage_spl,   /* nv_ao_alloc() */
 362 +       .nv_ao_free = nv_free_spl,              /* nv_ao_free() */
 363  };
 364
 365  const nv_alloc_ops_t spl_nosleep_ops_def = {
 366 -       NULL,                   /* nv_ao_init() */
 367 -       NULL,                   /* nv_ao_fini() */
 368 -       nv_alloc_nosleep_spl,   /* nv_ao_alloc() */
 369 -       nv_free_spl,            /* nv_ao_free() */
 370 -       NULL                    /* nv_ao_reset() */
 371 +       .nv_ao_alloc = nv_alloc_nosleep_spl,    /* nv_ao_alloc() */
 372 +       .nv_ao_free = nv_free_spl,              /* nv_ao_free() */
 373  };
 374
 375  nv_alloc_t nv_alloc_sleep_def = {
 376 -       &spl_sleep_ops_def,
 377 -       NULL
 378 +       .nva_ops = &spl_sleep_ops_def,
 379  };
 380
 381  nv_alloc_t nv_alloc_pushpage_def = {
 382 -       &spl_pushpage_ops_def,
 383 -       NULL
 384 +       .nva_ops = &spl_pushpage_ops_def,
 385  };
 386
 387  nv_alloc_t nv_alloc_nosleep_def = {
 388 -       &spl_nosleep_ops_def,
 389 -       NULL
 390 +       .nva_ops = &spl_nosleep_ops_def,
 391  };
 392
 393  nv_alloc_t *nv_alloc_sleep = &nv_alloc_sleep_def;
 394 diff -ur -x Makefile.in zfs-0.7.3/module/nvpair/nvpair.c zfs-0.7.3-randstruct/module/nvpair/nvpair.c
 395 --- zfs-0.7.3/module/nvpair/nvpair.c    2017-10-18 23:47:55.000000000 +0200
 396 +++ zfs-0.7.3-randstruct/module/nvpair/nvpair.c 2017-11-18 13:36:35.657744967 +0100
 397 @@ -2801,11 +2801,11 @@
 398  }
 399
 400  static const nvs_ops_t nvs_native_ops = {
 401 -       nvs_native_nvlist,
 402 -       nvs_native_nvpair,
 403 -       nvs_native_nvp_op,
 404 -       nvs_native_nvp_size,
 405 -       nvs_native_nvl_fini
 406 +       .nvs_nvlist   = nvs_native_nvlist,
 407 +       .nvs_nvpair   = nvs_native_nvpair,
 408 +       .nvs_nvp_op   = nvs_native_nvp_op,
 409 +       .nvs_nvp_size = nvs_native_nvp_size,
 410 +       .nvs_nvl_fini = nvs_native_nvl_fini
 411  };
 412
 413  static int
 414 @@ -3288,11 +3288,11 @@
 415  }
 416
 417  static const struct nvs_ops nvs_xdr_ops = {
 418 -       nvs_xdr_nvlist,
 419 -       nvs_xdr_nvpair,
 420 -       nvs_xdr_nvp_op,
 421 -       nvs_xdr_nvp_size,
 422 -       nvs_xdr_nvl_fini
 423 +       .nvs_nvlist   = nvs_xdr_nvlist,
 424 +       .nvs_nvpair   = nvs_xdr_nvpair,
 425 +       .nvs_nvp_op   = nvs_xdr_nvp_op,
 426 +       .nvs_nvp_size = nvs_xdr_nvp_size,
 427 +       .nvs_nvl_fini = nvs_xdr_nvl_fini
 428  };
 429
 430  static int
 431 diff -ur -x Makefile.in zfs-0.7.3/module/zfs/fm.c zfs-0.7.3-randstruct/module/zfs/fm.c
 432 --- zfs-0.7.3/module/zfs/fm.c   2017-10-18 23:47:55.000000000 +0200
 433 +++ zfs-0.7.3-randstruct/module/zfs/fm.c        2017-11-18 15:00:16.140450509 +0100
 434 @@ -794,11 +794,8 @@
 435  }
 436
 437  const nv_alloc_ops_t fm_mem_alloc_ops = {
 438 -       NULL,
 439 -       NULL,
 440 -       i_fm_alloc,
 441 -       i_fm_free,
 442 -       NULL
 443 +       .nv_ao_alloc = i_fm_alloc,
 444 +       .nv_ao_free = i_fm_free,
 445  };
 446
 447  /*
 448 diff -ur -x Makefile.in zfs-0.7.3/module/zfs/metaslab.c zfs-0.7.3-randstruct/module/zfs/metaslab.c
 449 --- zfs-0.7.3/module/zfs/metaslab.c     2017-10-18 23:47:55.000000000 +0200
 450 +++ zfs-0.7.3-randstruct/module/zfs/metaslab.c  2017-11-18 15:02:58.668193558 +0100
 451 @@ -1049,11 +1049,11 @@
 452  }
 453
 454  static range_tree_ops_t metaslab_rt_ops = {
 455 -       metaslab_rt_create,
 456 -       metaslab_rt_destroy,
 457 -       metaslab_rt_add,
 458 -       metaslab_rt_remove,
 459 -       metaslab_rt_vacate
 460 +       .rtop_create  = metaslab_rt_create,
 461 +       .rtop_destroy = metaslab_rt_destroy,
 462 +       .rtop_add     = metaslab_rt_add,
 463 +       .rtop_remove  = metaslab_rt_remove,
 464 +       .rtop_vacate  = metaslab_rt_vacate
 465  };
 466
 467  /*
 468 diff -ur -x Makefile.in zfs-0.7.3/module/zfs/vdev_mirror.c zfs-0.7.3-randstruct/module/zfs/vdev_mirror.c
 469 --- zfs-0.7.3/module/zfs/vdev_mirror.c  2017-10-18 23:47:55.000000000 +0200
 470 +++ zfs-0.7.3-randstruct/module/zfs/vdev_mirror.c       2017-11-18 15:07:03.201488373 +0100
 471 @@ -109,8 +109,8 @@
 472  }
 473
 474  static const zio_vsd_ops_t vdev_mirror_vsd_ops = {
 475 -       vdev_mirror_map_free,
 476 -       zio_vsd_default_cksum_report
 477 +       .vsd_free = vdev_mirror_map_free,
 478 +       .vsd_cksum_report = zio_vsd_default_cksum_report
 479  };
 480
 481  static int
 482 diff -ur -x Makefile.in zfs-0.7.3/module/zfs/vdev_raidz.c zfs-0.7.3-randstruct/module/zfs/vdev_raidz.c
 483 --- zfs-0.7.3/module/zfs/vdev_raidz.c   2017-10-18 23:47:55.000000000 +0200
 484 +++ zfs-0.7.3-randstruct/module/zfs/vdev_raidz.c        2017-11-18 15:08:11.920011894 +0100
 485 @@ -318,8 +318,8 @@
 486  }
 487
 488  static const zio_vsd_ops_t vdev_raidz_vsd_ops = {
 489 -       vdev_raidz_map_free_vsd,
 490 -       vdev_raidz_cksum_report
 491 +       .vsd_free = vdev_raidz_map_free_vsd,
 492 +       .vsd_cksum_report = vdev_raidz_cksum_report
 493  };
 494
 495  /*
 496 diff -ur -x Makefile.in zfs-0.7.3/module/zfs/zfs_acl.c zfs-0.7.3-randstruct/module/zfs/zfs_acl.c
 497 --- zfs-0.7.3/module/zfs/zfs_acl.c      2017-10-18 23:47:55.000000000 +0200
 498 +++ zfs-0.7.3-randstruct/module/zfs/zfs_acl.c   2017-11-18 15:12:28.276899635 +0100
 499 @@ -174,18 +174,18 @@
 500  }
 501
 502  static acl_ops_t zfs_acl_v0_ops = {
 503 -       zfs_ace_v0_get_mask,
 504 -       zfs_ace_v0_set_mask,
 505 -       zfs_ace_v0_get_flags,
 506 -       zfs_ace_v0_set_flags,
 507 -       zfs_ace_v0_get_type,
 508 -       zfs_ace_v0_set_type,
 509 -       zfs_ace_v0_get_who,
 510 -       zfs_ace_v0_set_who,
 511 -       zfs_ace_v0_size,
 512 -       zfs_ace_v0_abstract_size,
 513 -       zfs_ace_v0_mask_off,
 514 -       zfs_ace_v0_data
 515 +       .ace_mask_get      = zfs_ace_v0_get_mask,
 516 +       .ace_mask_set      = zfs_ace_v0_set_mask,
 517 +       .ace_flags_get     = zfs_ace_v0_get_flags,
 518 +       .ace_flags_set     = zfs_ace_v0_set_flags,
 519 +       .ace_type_get      = zfs_ace_v0_get_type,
 520 +       .ace_type_set      = zfs_ace_v0_set_type,
 521 +       .ace_who_get       = zfs_ace_v0_get_who,
 522 +       .ace_who_set       = zfs_ace_v0_set_who,
 523 +       .ace_size          = zfs_ace_v0_size,
 524 +       .ace_abstract_size = zfs_ace_v0_abstract_size,
 525 +       .ace_mask_off      = zfs_ace_v0_mask_off,
 526 +       .ace_data          = zfs_ace_v0_data
 527  };
 528
 529  static uint16_t
 530 @@ -310,18 +310,18 @@
 531  }
 532
 533  static acl_ops_t zfs_acl_fuid_ops = {
 534 -       zfs_ace_fuid_get_mask,
 535 -       zfs_ace_fuid_set_mask,
 536 -       zfs_ace_fuid_get_flags,
 537 -       zfs_ace_fuid_set_flags,
 538 -       zfs_ace_fuid_get_type,
 539 -       zfs_ace_fuid_set_type,
 540 -       zfs_ace_fuid_get_who,
 541 -       zfs_ace_fuid_set_who,
 542 -       zfs_ace_fuid_size,
 543 -       zfs_ace_fuid_abstract_size,
 544 -       zfs_ace_fuid_mask_off,
 545 -       zfs_ace_fuid_data
 546 +       .ace_mask_get      = zfs_ace_fuid_get_mask,
 547 +       .ace_mask_set      = zfs_ace_fuid_set_mask,
 548 +       .ace_flags_get     = zfs_ace_fuid_get_flags,
 549 +       .ace_flags_set     = zfs_ace_fuid_set_flags,
 550 +       .ace_type_get      = zfs_ace_fuid_get_type,
 551 +       .ace_type_set      = zfs_ace_fuid_set_type,
 552 +       .ace_who_get       = zfs_ace_fuid_get_who,
 553 +       .ace_who_set       = zfs_ace_fuid_set_who,
 554 +       .ace_size          = zfs_ace_fuid_size,
 555 +       .ace_abstract_size = zfs_ace_fuid_abstract_size,
 556 +       .ace_mask_off      = zfs_ace_fuid_mask_off,
 557 +       .ace_data          = zfs_ace_fuid_data
 558  };
 559
 560  /*