We switched to plug mq_list for mq, but some code are still using old list.
Signed-off-by: Shaohua Li <s...@fusionio.com>
---
block/blk-core.c | 8 +++++++-
block/blk-mq.c | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
Index: linux/block/blk-core.c
===================================================================
--- linux.orig/block/blk-core.c 2013-10-29 11:26:16.556586892 -0600
+++ linux/block/blk-core.c 2013-10-29 11:26:21.014356939 -0600
@@ -1411,6 +1411,7 @@
struct blk_plug *plug;
struct request *rq;
bool ret = false;
+ struct list_head *plug_list;
if (blk_queue_nomerges(q))
goto out;
@@ -1420,7 +1421,12 @@
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)
Index: linux/block/blk-mq.c
===================================================================
--- linux.orig/block/blk-mq.c 2013-10-29 11:26:16.556586892 -0600
+++ linux/block/blk-mq.c 2013-10-29 11:26:21.014356939 -0600
@@ -950,7 +950,7 @@
if (plug) {
blk_mq_bio_to_request(rq, bio);
- if (list_empty(&plug->list))
+ if (list_empty(&plug->mq_list))
trace_block_plug(q);
else if (request_count >= BLK_MAX_REQUEST_COUNT) {
blk_flush_plug_list(plug, false);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
