Skip to content

Commit 255e48e

Browse files
herbertxherbertx
committed
crypto: api - Use data directly in completion function
This patch does the final flag day conversion of all completion functions which are now all contained in the Crypto API. Signed-off-by: Herbert Xu <[email protected]>
1 parent 234650b commit 255e48e

File tree

23 files changed

+133
-152
lines changed

23 files changed

+133
-152
lines changed

‎crypto/adiantum.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,9 @@ static int adiantum_finish(struct skcipher_request *req)
308308
return 0;
309309
}
310310

311-
static void adiantum_streamcipher_done(struct crypto_async_request *areq,
312-
int err)
311+
static void adiantum_streamcipher_done(void *data, int err)
313312
{
314-
struct skcipher_request *req = areq->data;
313+
struct skcipher_request *req = data;
315314

316315
if (!err)
317316
err = adiantum_finish(req);

‎crypto/af_alg.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ EXPORT_SYMBOL_GPL(af_alg_free_resources);
11861186

11871187
/**
11881188
* af_alg_async_cb - AIO callback handler
1189-
* @_req: async request info
1189+
* @data: async request completion data
11901190
* @err: if non-zero, error result to be returned via ki_complete();
11911191
* otherwise return the AIO output length via ki_complete().
11921192
*
@@ -1196,9 +1196,9 @@ EXPORT_SYMBOL_GPL(af_alg_free_resources);
11961196
* The number of bytes to be generated with the AIO operation must be set
11971197
* in areq->outlen before the AIO callback handler is invoked.
11981198
*/
1199-
void af_alg_async_cb(struct crypto_async_request *_req, int err)
1199+
void af_alg_async_cb(void *data, int err)
12001200
{
1201-
struct af_alg_async_req *areq = _req->data;
1201+
struct af_alg_async_req *areq = data;
12021202
struct sock *sk = areq->sk;
12031203
struct kiocb *iocb = areq->iocb;
12041204
unsigned int resultlen;

‎crypto/ahash.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@ static void ahash_restore_req(struct ahash_request *req, int err)
256256
kfree_sensitive(subreq);
257257
}
258258

259-
static void ahash_op_unaligned_done(struct crypto_async_request *req, int err)
259+
static void ahash_op_unaligned_done(void *data, int err)
260260
{
261-
struct ahash_request *areq = req->data;
261+
struct ahash_request *areq = data;
262262

263263
if (err == -EINPROGRESS)
264264
goto out;
@@ -348,9 +348,9 @@ int crypto_ahash_digest(struct ahash_request *req)
348348
}
349349
EXPORT_SYMBOL_GPL(crypto_ahash_digest);
350350

351-
static void ahash_def_finup_done2(struct crypto_async_request *req, int err)
351+
static void ahash_def_finup_done2(void *data, int err)
352352
{
353-
struct ahash_request *areq = req->data;
353+
struct ahash_request *areq = data;
354354

355355
if (err == -EINPROGRESS)
356356
return;
@@ -378,9 +378,9 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err)
378378
return err;
379379
}
380380

381-
static void ahash_def_finup_done1(struct crypto_async_request *req, int err)
381+
static void ahash_def_finup_done1(void *data, int err)
382382
{
383-
struct ahash_request *areq = req->data;
383+
struct ahash_request *areq = data;
384384
struct ahash_request *subreq;
385385

386386
if (err == -EINPROGRESS)

‎crypto/api.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,9 +643,9 @@ int crypto_has_alg(const char *name, u32 type, u32 mask)
643643
}
644644
EXPORT_SYMBOL_GPL(crypto_has_alg);
645645

646-
void crypto_req_done(struct crypto_async_request *req, int err)
646+
void crypto_req_done(void *data, int err)
647647
{
648-
struct crypto_wait *wait = req->data;
648+
struct crypto_wait *wait = data;
649649

650650
if (err == -EINPROGRESS)
651651
return;

‎crypto/authenc.c‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
109109
return err;
110110
}
111111

112-
static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
112+
static void authenc_geniv_ahash_done(void *data, int err)
113113
{
114-
struct aead_request *req = areq->data;
114+
struct aead_request *req = data;
115115
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
116116
struct aead_instance *inst = aead_alg_instance(authenc);
117117
struct authenc_instance_ctx *ictx = aead_instance_ctx(inst);
@@ -160,10 +160,9 @@ static int crypto_authenc_genicv(struct aead_request *req, unsigned int flags)
160160
return 0;
161161
}
162162

163-
static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
164-
int err)
163+
static void crypto_authenc_encrypt_done(void *data, int err)
165164
{
166-
struct aead_request *areq = req->data;
165+
struct aead_request *areq = data;
167166

168167
if (err)
169168
goto out;
@@ -261,10 +260,9 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req,
261260
return crypto_skcipher_decrypt(skreq);
262261
}
263262

264-
static void authenc_verify_ahash_done(struct crypto_async_request *areq,
265-
int err)
263+
static void authenc_verify_ahash_done(void *data, int err)
266264
{
267-
struct aead_request *req = areq->data;
265+
struct aead_request *req = data;
268266

269267
if (err)
270268
goto out;

‎crypto/authencesn.c‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,9 @@ static int crypto_authenc_esn_genicv_tail(struct aead_request *req,
107107
return 0;
108108
}
109109

110-
static void authenc_esn_geniv_ahash_done(struct crypto_async_request *areq,
111-
int err)
110+
static void authenc_esn_geniv_ahash_done(void *data, int err)
112111
{
113-
struct aead_request *req = areq->data;
112+
struct aead_request *req = data;
114113

115114
err = err ?: crypto_authenc_esn_genicv_tail(req, 0);
116115
aead_request_complete(req, err);
@@ -153,10 +152,9 @@ static int crypto_authenc_esn_genicv(struct aead_request *req,
153152
}
154153

155154

156-
static void crypto_authenc_esn_encrypt_done(struct crypto_async_request *req,
157-
int err)
155+
static void crypto_authenc_esn_encrypt_done(void *data, int err)
158156
{
159-
struct aead_request *areq = req->data;
157+
struct aead_request *areq = data;
160158

161159
if (!err)
162160
err = crypto_authenc_esn_genicv(areq, 0);
@@ -258,10 +256,9 @@ static int crypto_authenc_esn_decrypt_tail(struct aead_request *req,
258256
return crypto_skcipher_decrypt(skreq);
259257
}
260258

261-
static void authenc_esn_verify_ahash_done(struct crypto_async_request *areq,
262-
int err)
259+
static void authenc_esn_verify_ahash_done(void *data, int err)
263260
{
264-
struct aead_request *req = areq->data;
261+
struct aead_request *req = data;
265262

266263
err = err ?: crypto_authenc_esn_decrypt_tail(req, 0);
267264
authenc_esn_request_complete(req, err);

‎crypto/ccm.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain,
224224
return err;
225225
}
226226

227-
static void crypto_ccm_encrypt_done(struct crypto_async_request *areq, int err)
227+
static void crypto_ccm_encrypt_done(void *data, int err)
228228
{
229-
struct aead_request *req = areq->data;
229+
struct aead_request *req = data;
230230
struct crypto_aead *aead = crypto_aead_reqtfm(req);
231231
struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);
232232
u8 *odata = pctx->odata;
@@ -320,10 +320,9 @@ static int crypto_ccm_encrypt(struct aead_request *req)
320320
return err;
321321
}
322322

323-
static void crypto_ccm_decrypt_done(struct crypto_async_request *areq,
324-
int err)
323+
static void crypto_ccm_decrypt_done(void *data, int err)
325324
{
326-
struct aead_request *req = areq->data;
325+
struct aead_request *req = data;
327326
struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);
328327
struct crypto_aead *aead = crypto_aead_reqtfm(req);
329328
unsigned int authsize = crypto_aead_authsize(aead);

‎crypto/chacha20poly1305.c‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ static int poly_copy_tag(struct aead_request *req)
115115
return 0;
116116
}
117117

118-
static void chacha_decrypt_done(struct crypto_async_request *areq, int err)
118+
static void chacha_decrypt_done(void *data, int err)
119119
{
120-
async_done_continue(areq->data, err, poly_verify_tag);
120+
async_done_continue(data, err, poly_verify_tag);
121121
}
122122

123123
static int chacha_decrypt(struct aead_request *req)
@@ -161,9 +161,9 @@ static int poly_tail_continue(struct aead_request *req)
161161
return chacha_decrypt(req);
162162
}
163163

164-
static void poly_tail_done(struct crypto_async_request *areq, int err)
164+
static void poly_tail_done(void *data, int err)
165165
{
166-
async_done_continue(areq->data, err, poly_tail_continue);
166+
async_done_continue(data, err, poly_tail_continue);
167167
}
168168

169169
static int poly_tail(struct aead_request *req)
@@ -191,9 +191,9 @@ static int poly_tail(struct aead_request *req)
191191
return poly_tail_continue(req);
192192
}
193193

194-
static void poly_cipherpad_done(struct crypto_async_request *areq, int err)
194+
static void poly_cipherpad_done(void *data, int err)
195195
{
196-
async_done_continue(areq->data, err, poly_tail);
196+
async_done_continue(data, err, poly_tail);
197197
}
198198

199199
static int poly_cipherpad(struct aead_request *req)
@@ -220,9 +220,9 @@ static int poly_cipherpad(struct aead_request *req)
220220
return poly_tail(req);
221221
}
222222

223-
static void poly_cipher_done(struct crypto_async_request *areq, int err)
223+
static void poly_cipher_done(void *data, int err)
224224
{
225-
async_done_continue(areq->data, err, poly_cipherpad);
225+
async_done_continue(data, err, poly_cipherpad);
226226
}
227227

228228
static int poly_cipher(struct aead_request *req)
@@ -250,9 +250,9 @@ static int poly_cipher(struct aead_request *req)
250250
return poly_cipherpad(req);
251251
}
252252

253-
static void poly_adpad_done(struct crypto_async_request *areq, int err)
253+
static void poly_adpad_done(void *data, int err)
254254
{
255-
async_done_continue(areq->data, err, poly_cipher);
255+
async_done_continue(data, err, poly_cipher);
256256
}
257257

258258
static int poly_adpad(struct aead_request *req)
@@ -279,9 +279,9 @@ static int poly_adpad(struct aead_request *req)
279279
return poly_cipher(req);
280280
}
281281

282-
static void poly_ad_done(struct crypto_async_request *areq, int err)
282+
static void poly_ad_done(void *data, int err)
283283
{
284-
async_done_continue(areq->data, err, poly_adpad);
284+
async_done_continue(data, err, poly_adpad);
285285
}
286286

287287
static int poly_ad(struct aead_request *req)
@@ -303,9 +303,9 @@ static int poly_ad(struct aead_request *req)
303303
return poly_adpad(req);
304304
}
305305

306-
static void poly_setkey_done(struct crypto_async_request *areq, int err)
306+
static void poly_setkey_done(void *data, int err)
307307
{
308-
async_done_continue(areq->data, err, poly_ad);
308+
async_done_continue(data, err, poly_ad);
309309
}
310310

311311
static int poly_setkey(struct aead_request *req)
@@ -329,9 +329,9 @@ static int poly_setkey(struct aead_request *req)
329329
return poly_ad(req);
330330
}
331331

332-
static void poly_init_done(struct crypto_async_request *areq, int err)
332+
static void poly_init_done(void *data, int err)
333333
{
334-
async_done_continue(areq->data, err, poly_setkey);
334+
async_done_continue(data, err, poly_setkey);
335335
}
336336

337337
static int poly_init(struct aead_request *req)
@@ -352,9 +352,9 @@ static int poly_init(struct aead_request *req)
352352
return poly_setkey(req);
353353
}
354354

355-
static void poly_genkey_done(struct crypto_async_request *areq, int err)
355+
static void poly_genkey_done(void *data, int err)
356356
{
357-
async_done_continue(areq->data, err, poly_init);
357+
async_done_continue(data, err, poly_init);
358358
}
359359

360360
static int poly_genkey(struct aead_request *req)
@@ -391,9 +391,9 @@ static int poly_genkey(struct aead_request *req)
391391
return poly_init(req);
392392
}
393393

394-
static void chacha_encrypt_done(struct crypto_async_request *areq, int err)
394+
static void chacha_encrypt_done(void *data, int err)
395395
{
396-
async_done_continue(areq->data, err, poly_genkey);
396+
async_done_continue(data, err, poly_genkey);
397397
}
398398

399399
static int chacha_encrypt(struct aead_request *req)

0 commit comments

Comments
 (0)