raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2026-01-04 18:27:36 +00:00
Code Issues Projects Releases Wiki Activity

blk-mq: do not reset plug->rq_count before the list is sorted

Browse Source 
[ Upstream commit bcc816dfe5 ]

We would never be able to sort the list if we first reset plug->rq_count
which is used in conditional check later.

Fixes: ce5b009cff ("block: improve logic around when to sort a plug list")
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
This commit is contained in:
Dongli Zhang
2019-04-04 10:57:44 +08:00
committed by Greg Kroah-Hartman
parent 9bc06b41fd
commit 2c52a30e21
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
block/blk-mq.c
View File

@@ -1716,11 +1716,12 @@ void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule)
unsigned int depth; unsigned int depth;
list_splice_init(&plug->mq_list, &list); list_splice_init(&plug->mq_list, &list);
plug->rq_count = 0;
if (plug->rq_count > 2 && plug->multiple_queues) if (plug->rq_count > 2 && plug->multiple_queues)
list_sort(NULL, &list, plug_rq_cmp); list_sort(NULL, &list, plug_rq_cmp);
plug->rq_count = 0;
this_q = NULL; this_q = NULL;
this_hctx = NULL; this_hctx = NULL;
this_ctx = NULL; this_ctx = NULL;