write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/block/blk-mq.c
..
..
@@ -451,7 +451,8 @@
451
451
 	 * allocator for this for the rare use case of a command tied to
452
452
 	 * a specific queue.
453
453
 	 */
454
-	if (WARN_ON_ONCE(!(flags & (BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_RESERVED))))
454
+	if (WARN_ON_ONCE(!(flags & BLK_MQ_REQ_NOWAIT)) ||
455
+	    WARN_ON_ONCE(!(flags & BLK_MQ_REQ_RESERVED)))
455
456
 		return ERR_PTR(-EINVAL);
456
457
 
457
458
 	if (hctx_idx >= q->nr_hw_queues)
..
..
@@ -2247,7 +2248,7 @@
2247
2248
 
2248
2249
 	blk_mq_bio_to_request(rq, bio, nr_segs);
2249
2250
 
2250
-	ret = blk_crypto_init_request(rq);
2251
+	ret = blk_crypto_rq_get_keyslot(rq);
2251
2252
 	if (ret != BLK_STS_OK) {
2252
2253
 		bio->bi_status = ret;
2253
2254
 		bio_endio(bio);