summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2015-10-20 23:13:56 +0800
committerJens Axboe <axboe@fb.com>2015-10-21 15:00:56 -0600
commit676d06077f964f06af52c19e59f0409a8880612f (patch)
tree3f7e5c796a014c2384434e92051e85b025de061b /block
parent7460d389c01741f0dfff733af93d3b3abd9b974e (diff)
downloadlinux-sh-676d06077f964f06af52c19e59f0409a8880612f.tar.gz
blk-mq: fix for trace_block_plug()
The trace point is for tracing plug event of each request queue instead of each task, so we should check the request count in the plug list from current queue instead of current task. Signed-off-by: Ming Lei <ming.lei@canonical.com> Reviewed-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index d38371160019..24c528f182ea 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1380,7 +1380,7 @@ static void blk_sq_make_request(struct request_queue *q, struct bio *bio)
plug = current->plug;
if (plug) {
blk_mq_bio_to_request(rq, bio);
- if (list_empty(&plug->mq_list))
+ if (!request_count)
trace_block_plug(q);
else if (request_count >= BLK_MAX_REQUEST_COUNT) {
blk_flush_plug_list(plug, false);