Commit 334e5a82 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'block-6.3-2023-04-21' of git://git.kernel.dk/linux

Pull block fix from Jens Axboe:
 "Just a single revert of a patch from the 6.3 series"

* tag 'block-6.3-2023-04-21' of git://git.kernel.dk/linux:
  Revert "block: Merge bio before checking ->cached_rq"
parents 8fd06d44 81ea1222
...@@ -2878,16 +2878,15 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q, ...@@ -2878,16 +2878,15 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q,
if (!plug) if (!plug)
return NULL; return NULL;
rq = rq_list_peek(&plug->cached_rq);
if (!rq || rq->q != q)
return NULL;
if (blk_mq_attempt_bio_merge(q, *bio, nsegs)) { if (blk_mq_attempt_bio_merge(q, *bio, nsegs)) {
*bio = NULL; *bio = NULL;
return NULL; return NULL;
} }
rq = rq_list_peek(&plug->cached_rq);
if (!rq || rq->q != q)
return NULL;
type = blk_mq_get_hctx_type((*bio)->bi_opf); type = blk_mq_get_hctx_type((*bio)->bi_opf);
hctx_type = rq->mq_hctx->type; hctx_type = rq->mq_hctx->type;
if (type != hctx_type && if (type != hctx_type &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment