2 +++ test117.right-P.txt
4 struct sr_crypto_kdfinfo *, struct sr_crypto_kdfinfo *);
5 int sr_crypto_create(struct sr_discipline *,
6 struct bioc_createraid *, int, int64_t);
7 +int sr_crypto_init(struct sr_discipline *,
8 + struct bioc_createraid *);
9 int sr_crypto_assemble(struct sr_discipline *,
10 struct bioc_createraid *, int, void *);
11 int sr_crypto_alloc_resources(struct sr_discipline *);
13 sr_crypto_create(struct sr_discipline *sd, struct bioc_createraid *bc,
14 int no_chunk, int64_t coerced_size)
16 - struct sr_meta_opt_item *omi;
21 sr_error(sd->sd_sc, "%s requires exactly one chunk",
27 - if (coerced_size > SR_CRYPTO_MAXSIZE) {
28 + sd->sd_meta->ssdi.ssd_size = coerced_size;
30 + rv = sr_crypto_init(sd, bc);
34 + sd->sd_max_ccb_per_wu = no_chunk;
39 +sr_crypto_init(struct sr_discipline *sd, struct bioc_createraid *bc)
41 + struct sr_meta_opt_item *omi;
44 + if (sd->sd_meta->ssdi.ssd_size > SR_CRYPTO_MAXSIZE) {
45 sr_error(sd->sd_sc, "%s exceeds maximum size (%lli > %llu)",
46 - sd->sd_name, coerced_size, SR_CRYPTO_MAXSIZE);
47 + sd->sd_name, sd->sd_meta->ssdi.ssd_size,
53 if (!(bc->bc_flags & BIOC_SCNOAUTOASSEMBLE) && bc->bc_key_disk == NODEV)
56 - sd->sd_meta->ssdi.ssd_size = coerced_size;
58 sr_crypto_create_keys(sd);
60 - sd->sd_max_ccb_per_wu = no_chunk;