block: Merge bio before checking ->cached_rq
authorXiao Ni <xni@redhat.com>
Thu, 9 Feb 2023 03:19:30 +0000 (11:19 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 9 Feb 2023 15:11:25 +0000 (08:11 -0700)
commit23f3e3272e7a4d9fb870485cd6df1e4f9539282c
tree4db43c1367b06fd524083a2a7539d0397ed44fac
parentdcb52201435197c56154ff7c8cb139284d254bda
block: Merge bio before checking ->cached_rq

It checks if plug->cached_rq is empty before merging bio. But the merge action
doesn't have relationship with plug->cached_rq, it trys to merge bio with
requests within plug->mq_list. Now it checks if ->cached_rq is empty before
merging bio. If it's empty, it will miss the merge chances. So move the merge
function before checking ->cached_rq.

Signed-off-by: Xiao Ni <xni@redhat.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230209031930.27354-1-xni@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-mq.c