Revert "block: Merge bio before checking ->cached_rq"
authorMing Lei <ming.lei@redhat.com>
Thu, 20 Apr 2023 11:20:18 +0000 (19:20 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Apr 2023 12:54:17 +0000 (06:54 -0600)
commit81ea1222f2fa5006f4b9759c2fe1ec154109622d
tree3e62a64a9df6d8d8a1ca898e8596c21f3a99cd82
parentf7ca1ae32bd89ab035568c63b4443eb55420b423
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>
block/blk-mq.c