diff options
Diffstat (limited to 'include/trace/events/block.h')
| -rw-r--r-- | include/trace/events/block.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 53effd496a50..d6b05f42dd44 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h | |||
| @@ -25,9 +25,8 @@ TRACE_EVENT(block_rq_abort, | |||
| 25 | 25 | ||
| 26 | TP_fast_assign( | 26 | TP_fast_assign( |
| 27 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; | 27 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; |
| 28 | __entry->sector = blk_pc_request(rq) ? 0 : rq->hard_sector; | 28 | __entry->sector = blk_pc_request(rq) ? 0 : blk_rq_pos(rq); |
| 29 | __entry->nr_sector = blk_pc_request(rq) ? | 29 | __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq); |
| 30 | 0 : rq->hard_nr_sectors; | ||
| 31 | __entry->errors = rq->errors; | 30 | __entry->errors = rq->errors; |
| 32 | 31 | ||
| 33 | blk_fill_rwbs_rq(__entry->rwbs, rq); | 32 | blk_fill_rwbs_rq(__entry->rwbs, rq); |
| @@ -59,10 +58,9 @@ TRACE_EVENT(block_rq_insert, | |||
| 59 | 58 | ||
| 60 | TP_fast_assign( | 59 | TP_fast_assign( |
| 61 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; | 60 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; |
| 62 | __entry->sector = blk_pc_request(rq) ? 0 : rq->hard_sector; | 61 | __entry->sector = blk_pc_request(rq) ? 0 : blk_rq_pos(rq); |
| 63 | __entry->nr_sector = blk_pc_request(rq) ? | 62 | __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq); |
| 64 | 0 : rq->hard_nr_sectors; | 63 | __entry->bytes = blk_pc_request(rq) ? blk_rq_bytes(rq) : 0; |
| 65 | __entry->bytes = blk_pc_request(rq) ? rq->data_len : 0; | ||
| 66 | 64 | ||
| 67 | blk_fill_rwbs_rq(__entry->rwbs, rq); | 65 | blk_fill_rwbs_rq(__entry->rwbs, rq); |
| 68 | blk_dump_cmd(__get_str(cmd), rq); | 66 | blk_dump_cmd(__get_str(cmd), rq); |
| @@ -94,10 +92,9 @@ TRACE_EVENT(block_rq_issue, | |||
| 94 | 92 | ||
| 95 | TP_fast_assign( | 93 | TP_fast_assign( |
| 96 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; | 94 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; |
| 97 | __entry->sector = blk_pc_request(rq) ? 0 : rq->hard_sector; | 95 | __entry->sector = blk_pc_request(rq) ? 0 : blk_rq_pos(rq); |
| 98 | __entry->nr_sector = blk_pc_request(rq) ? | 96 | __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq); |
| 99 | 0 : rq->hard_nr_sectors; | 97 | __entry->bytes = blk_pc_request(rq) ? blk_rq_bytes(rq) : 0; |
| 100 | __entry->bytes = blk_pc_request(rq) ? rq->data_len : 0; | ||
| 101 | 98 | ||
| 102 | blk_fill_rwbs_rq(__entry->rwbs, rq); | 99 | blk_fill_rwbs_rq(__entry->rwbs, rq); |
| 103 | blk_dump_cmd(__get_str(cmd), rq); | 100 | blk_dump_cmd(__get_str(cmd), rq); |
| @@ -128,9 +125,8 @@ TRACE_EVENT(block_rq_requeue, | |||
| 128 | 125 | ||
| 129 | TP_fast_assign( | 126 | TP_fast_assign( |
| 130 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; | 127 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; |
| 131 | __entry->sector = blk_pc_request(rq) ? 0 : rq->hard_sector; | 128 | __entry->sector = blk_pc_request(rq) ? 0 : blk_rq_pos(rq); |
| 132 | __entry->nr_sector = blk_pc_request(rq) ? | 129 | __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq); |
| 133 | 0 : rq->hard_nr_sectors; | ||
| 134 | __entry->errors = rq->errors; | 130 | __entry->errors = rq->errors; |
| 135 | 131 | ||
| 136 | blk_fill_rwbs_rq(__entry->rwbs, rq); | 132 | blk_fill_rwbs_rq(__entry->rwbs, rq); |
| @@ -161,9 +157,8 @@ TRACE_EVENT(block_rq_complete, | |||
| 161 | 157 | ||
| 162 | TP_fast_assign( | 158 | TP_fast_assign( |
| 163 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; | 159 | __entry->dev = rq->rq_disk ? disk_devt(rq->rq_disk) : 0; |
| 164 | __entry->sector = blk_pc_request(rq) ? 0 : rq->hard_sector; | 160 | __entry->sector = blk_pc_request(rq) ? 0 : blk_rq_pos(rq); |
| 165 | __entry->nr_sector = blk_pc_request(rq) ? | 161 | __entry->nr_sector = blk_pc_request(rq) ? 0 : blk_rq_sectors(rq); |
| 166 | 0 : rq->hard_nr_sectors; | ||
| 167 | __entry->errors = rq->errors; | 162 | __entry->errors = rq->errors; |
| 168 | 163 | ||
| 169 | blk_fill_rwbs_rq(__entry->rwbs, rq); | 164 | blk_fill_rwbs_rq(__entry->rwbs, rq); |