aboutsummaryrefslogtreecommitdiff
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorShaohua Li <shli@fusionio.com>2013-10-29 12:01:03 -0600
committerJens Axboe <axboe@kernel.dk>2013-10-29 12:01:03 -0600
commit92f399c72af2d8cbb9d4f60e11d0d67ca738147f (patch)
tree808309a8706de6bda501441b78127f6b1233ce0a /block/blk-core.c
parent3228f48be2d19b2dd90db96ec16a40187a2946f3 (diff)
downloadlinux-linaro-stable-92f399c72af2d8cbb9d4f60e11d0d67ca738147f.tar.gz
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>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r--block/blk-core.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 9677c6525ed8..936876ab662d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1401,13 +1401,19 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,
struct blk_plug *plug;
struct request *rq;
bool ret = false;
+ struct list_head *plug_list;
plug = current->plug;
if (!plug)
goto out;
*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;
if (rq->q == q)