From 47720974586e0c5d781877b43437c22bef463262 Mon Sep 17 00:00:00 2001 From: Jeff Moyer Date: Thu, 6 Jan 2011 20:41:42 +0100 Subject: [PATCH] --- yaml --- r: 230607 b: refs/heads/master c: b7908c1035af7652cd613991b54dbff9c8b6bd3a h: refs/heads/master i: 230605: c1b13cdd69a1bad1ff5a22252a9369c1af95fcb3 230603: c2cd27a4f62babc3d1268a7da97e6962d121bcbd 230599: 49b7620419f1ba6c30669b01cf4c9f737abbfefb 230591: da825cffd67607c52e6dc486a104f3e26276cb8b v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 2 +- trunk/include/trace/events/block.h | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 73e77022c3c0..30e47e1e5425 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c23a9681c0fe7fb7dd331b39dda11926f43746e +refs/heads/master: b7908c1035af7652cd613991b54dbff9c8b6bd3a diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index 0a2b5516bc21..f48a2f359ac4 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -630,7 +630,7 @@ static void dec_pending(struct dm_io *io, int error) queue_io(md, bio); } else { /* done with normal IO or empty flush */ - trace_block_bio_complete(md->queue, bio); + trace_block_bio_complete(md->queue, bio, io_error); bio_endio(bio, io_error); } } diff --git a/trunk/include/trace/events/block.h b/trunk/include/trace/events/block.h index b56c65dc105d..aba421d68f6f 100644 --- a/trunk/include/trace/events/block.h +++ b/trunk/include/trace/events/block.h @@ -206,15 +206,16 @@ TRACE_EVENT(block_bio_bounce, * block_bio_complete - completed all work on the block operation * @q: queue holding the block operation * @bio: block operation completed + * @error: io error value * * This tracepoint indicates there is no further work to do on this * block IO operation @bio. */ TRACE_EVENT(block_bio_complete, - TP_PROTO(struct request_queue *q, struct bio *bio), + TP_PROTO(struct request_queue *q, struct bio *bio, int error), - TP_ARGS(q, bio), + TP_ARGS(q, bio, error), TP_STRUCT__entry( __field( dev_t, dev ) @@ -228,6 +229,7 @@ TRACE_EVENT(block_bio_complete, __entry->dev = bio->bi_bdev->bd_dev; __entry->sector = bio->bi_sector; __entry->nr_sector = bio->bi_size >> 9; + __entry->error = error; blk_fill_rwbs(__entry->rwbs, bio->bi_rw, bio->bi_size); ),