tag eaa7224d217501a9cbcee6f6cb0c100e836f06e4
tagger Jens Axboe <axboe@kernel.dk> Fri Apr 21 09:00:36 2023 -0600
object 81ea1222f2fa5006f4b9759c2fe1ec154109622d

block-6.3-2023-04-21

commit 81ea1222f2fa5006f4b9759c2fe1ec154109622d
author Ming Lei <ming.lei@redhat.com> Thu Apr 20 19:20:18 2023 +0800
committer Jens Axboe <axboe@kernel.dk> Thu Apr 20 06:54:17 2023 -0600
tree 3e62a64a9df6d8d8a1ca898e8596c21f3a99cd82
parent f7ca1ae32bd89ab035568c63b4443eb55420b423

Revert "block: Merge bio before checking ->cached_rq"

This reverts commit 23f3e3272e7a4d9fb870485cd6df1e4f9539282c.

blk-mq sched bio merge still needs request to grab queue usage counter,
so we can't simply call blk_mq_attempt_bio_merge() when queue usage
counter isn't held.

Fixes: 23f3e3272e7a ("block: Merge bio before checking ->cached_rq")
Cc: Xiao Ni <xni@redhat.com>
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230420112018.1108058-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>