OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

blk-mq: mq plug list breakage 

We switched to plug mq_list for mq, but some code are still using old list.

Signed-off-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Shaohua Li 2013-10-29 12:01:03 -06:00 committed by Jens Axboe
parent 3228f48be2
commit 92f399c72a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-core.c
View File

@ -1401,13 +1401,19 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,
struct blk_plug *plug; struct blk_plug *plug;
struct request *rq; struct request *rq;
bool ret = false; bool ret = false;
struct list_head *plug_list;
plug = current->plug; plug = current->plug;
if (!plug) if (!plug)
goto out; goto out;
*request_count = 0; *request_count = 0;
list_for_each_entry_reverse(rq, &plug->list, queuelist) { if (q->mq_ops)
plug_list = &plug->mq_list;
else
plug_list = &plug->list;
list_for_each_entry_reverse(rq, plug_list, queuelist) {
int el_ret; int el_ret;
if (rq->q == q) if (rq->q == q)

2
block/blk-mq.c
View File

@ -950,7 +950,7 @@ static void blk_mq_make_request(struct request_queue *q, struct bio *bio)
if (plug) { if (plug) {
blk_mq_bio_to_request(rq, bio); blk_mq_bio_to_request(rq, bio);
if (list_empty(&plug->list)) if (list_empty(&plug->mq_list))
trace_block_plug(q); trace_block_plug(q);
else if (request_count >= BLK_MAX_REQUEST_COUNT) { else if (request_count >= BLK_MAX_REQUEST_COUNT) {
blk_flush_plug_list(plug, false); blk_flush_plug_list(plug, false);