diff options
author | Hannes Reinecke <hare@suse.de> | 2014-10-01 14:32:31 +0200 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-10-01 08:17:42 -0600 |
commit | 4a0efdc933680d908de11712a774a2c9492c3d5a (patch) | |
tree | abeb8de55841295acad03143bfff7e09709ff33c /block | |
parent | c611529e7cd3465ec0eada0f44200e8420c38908 (diff) | |
download | linux-stable-4a0efdc933680d908de11712a774a2c9492c3d5a.tar.gz linux-stable-4a0efdc933680d908de11712a774a2c9492c3d5a.tar.bz2 linux-stable-4a0efdc933680d908de11712a774a2c9492c3d5a.zip |
block: misplaced rq_complete tracepoint
The rq_complete tracepoint was never issued for empty requests,
causing the resulting blktrace information to never show any
completion for those request.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index e1c2775c7597..4aa9ccd02a50 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2400,11 +2400,11 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) { int total_bytes; + trace_block_rq_complete(req->q, req, nr_bytes); + if (!req->bio) return false; - trace_block_rq_complete(req->q, req, nr_bytes); - /* * For fs requests, rq is just carrier of independent bio's * and each partial completion should be handled separately. |