hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/block/blk-mq.c
....@@ -451,7 +451,8 @@
451451 * allocator for this for the rare use case of a command tied to
452452 * a specific queue.
453453 */
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)))
455456 return ERR_PTR(-EINVAL);
456457
457458 if (hctx_idx >= q->nr_hw_queues)
....@@ -2247,7 +2248,7 @@
22472248
22482249 blk_mq_bio_to_request(rq, bio, nr_segs);
22492250
2250
- ret = blk_crypto_init_request(rq);
2251
+ ret = blk_crypto_rq_get_keyslot(rq);
22512252 if (ret != BLK_STS_OK) {
22522253 bio->bi_status = ret;
22532254 bio_endio(bio);