.. | .. |
---|
164 | 164 | ), |
---|
165 | 165 | |
---|
166 | 166 | TP_fast_assign( |
---|
167 | | - memcpy(__entry->uuid, c->sb.set_uuid, 16); |
---|
| 167 | + memcpy(__entry->uuid, c->set_uuid, 16); |
---|
168 | 168 | __entry->inode = inode; |
---|
169 | 169 | __entry->sector = bio->bi_iter.bi_sector; |
---|
170 | 170 | __entry->nr_sector = bio->bi_iter.bi_size >> 9; |
---|
.. | .. |
---|
200 | 200 | ), |
---|
201 | 201 | |
---|
202 | 202 | TP_fast_assign( |
---|
203 | | - memcpy(__entry->uuid, c->sb.set_uuid, 16); |
---|
| 203 | + memcpy(__entry->uuid, c->set_uuid, 16); |
---|
204 | 204 | ), |
---|
205 | 205 | |
---|
206 | 206 | TP_printk("%pU", __entry->uuid) |
---|
.. | .. |
---|
221 | 221 | TP_ARGS(c) |
---|
222 | 222 | ); |
---|
223 | 223 | |
---|
224 | | -DEFINE_EVENT(bcache_bio, bcache_journal_write, |
---|
225 | | - TP_PROTO(struct bio *bio), |
---|
226 | | - TP_ARGS(bio) |
---|
| 224 | +TRACE_EVENT(bcache_journal_write, |
---|
| 225 | + TP_PROTO(struct bio *bio, u32 keys), |
---|
| 226 | + TP_ARGS(bio, keys), |
---|
| 227 | + |
---|
| 228 | + TP_STRUCT__entry( |
---|
| 229 | + __field(dev_t, dev ) |
---|
| 230 | + __field(sector_t, sector ) |
---|
| 231 | + __field(unsigned int, nr_sector ) |
---|
| 232 | + __array(char, rwbs, 6 ) |
---|
| 233 | + __field(u32, nr_keys ) |
---|
| 234 | + ), |
---|
| 235 | + |
---|
| 236 | + TP_fast_assign( |
---|
| 237 | + __entry->dev = bio_dev(bio); |
---|
| 238 | + __entry->sector = bio->bi_iter.bi_sector; |
---|
| 239 | + __entry->nr_sector = bio->bi_iter.bi_size >> 9; |
---|
| 240 | + __entry->nr_keys = keys; |
---|
| 241 | + blk_fill_rwbs(__entry->rwbs, bio->bi_opf, bio->bi_iter.bi_size); |
---|
| 242 | + ), |
---|
| 243 | + |
---|
| 244 | + TP_printk("%d,%d %s %llu + %u keys %u", |
---|
| 245 | + MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, |
---|
| 246 | + (unsigned long long)__entry->sector, __entry->nr_sector, |
---|
| 247 | + __entry->nr_keys) |
---|
227 | 248 | ); |
---|
228 | 249 | |
---|
229 | 250 | /* Btree */ |
---|
.. | .. |
---|
254 | 275 | __entry->keys = b->keys.set[b->keys.nsets].data->keys; |
---|
255 | 276 | ), |
---|
256 | 277 | |
---|
257 | | - TP_printk("bucket %zu", __entry->bucket) |
---|
| 278 | + TP_printk("bucket %zu written block %u + %u", |
---|
| 279 | + __entry->bucket, __entry->block, __entry->keys) |
---|
258 | 280 | ); |
---|
259 | 281 | |
---|
260 | 282 | DEFINE_EVENT(btree_node, bcache_btree_node_alloc, |
---|