diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:36:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:36:13 -0400 |
| commit | 37bf06375c90a42fe07b9bebdb07bc316ae5a0ce (patch) | |
| tree | de572dd6d3955b0725001776a7b03796f99e1e8e /include/trace | |
| parent | 6bfa687c19b7ab8adee03f0d43c197c2945dd869 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into sched/core
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.
Conflicts:
arch/avr32/include/asm/Kbuild
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/block.h | 6 | ||||
| -rw-r--r-- | include/trace/events/btrfs.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/trace/events/block.h b/include/trace/events/block.h index 60ae7c3db912..4c2301d2ef1a 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h | |||
| @@ -618,6 +618,7 @@ TRACE_EVENT(block_rq_remap, | |||
| 618 | __field( unsigned int, nr_sector ) | 618 | __field( unsigned int, nr_sector ) |
| 619 | __field( dev_t, old_dev ) | 619 | __field( dev_t, old_dev ) |
| 620 | __field( sector_t, old_sector ) | 620 | __field( sector_t, old_sector ) |
| 621 | __field( unsigned int, nr_bios ) | ||
| 621 | __array( char, rwbs, RWBS_LEN) | 622 | __array( char, rwbs, RWBS_LEN) |
| 622 | ), | 623 | ), |
| 623 | 624 | ||
| @@ -627,15 +628,16 @@ TRACE_EVENT(block_rq_remap, | |||
| 627 | __entry->nr_sector = blk_rq_sectors(rq); | 628 | __entry->nr_sector = blk_rq_sectors(rq); |
| 628 | __entry->old_dev = dev; | 629 | __entry->old_dev = dev; |
| 629 | __entry->old_sector = from; | 630 | __entry->old_sector = from; |
| 631 | __entry->nr_bios = blk_rq_count_bios(rq); | ||
| 630 | blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); | 632 | blk_fill_rwbs(__entry->rwbs, rq->cmd_flags, blk_rq_bytes(rq)); |
| 631 | ), | 633 | ), |
| 632 | 634 | ||
| 633 | TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", | 635 | TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu %u", |
| 634 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, | 636 | MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, |
| 635 | (unsigned long long)__entry->sector, | 637 | (unsigned long long)__entry->sector, |
| 636 | __entry->nr_sector, | 638 | __entry->nr_sector, |
| 637 | MAJOR(__entry->old_dev), MINOR(__entry->old_dev), | 639 | MAJOR(__entry->old_dev), MINOR(__entry->old_dev), |
| 638 | (unsigned long long)__entry->old_sector) | 640 | (unsigned long long)__entry->old_sector, __entry->nr_bios) |
| 639 | ); | 641 | ); |
| 640 | 642 | ||
| 641 | #endif /* _TRACE_BLOCK_H */ | 643 | #endif /* _TRACE_BLOCK_H */ |
diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h index 45702c3c3837..f18b3b76e01e 100644 --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h | |||
| @@ -42,6 +42,7 @@ struct extent_buffer; | |||
| 42 | { BTRFS_TREE_LOG_OBJECTID, "TREE_LOG" }, \ | 42 | { BTRFS_TREE_LOG_OBJECTID, "TREE_LOG" }, \ |
| 43 | { BTRFS_QUOTA_TREE_OBJECTID, "QUOTA_TREE" }, \ | 43 | { BTRFS_QUOTA_TREE_OBJECTID, "QUOTA_TREE" }, \ |
| 44 | { BTRFS_TREE_RELOC_OBJECTID, "TREE_RELOC" }, \ | 44 | { BTRFS_TREE_RELOC_OBJECTID, "TREE_RELOC" }, \ |
| 45 | { BTRFS_UUID_TREE_OBJECTID, "UUID_RELOC" }, \ | ||
| 45 | { BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" }) | 46 | { BTRFS_DATA_RELOC_TREE_OBJECTID, "DATA_RELOC_TREE" }) |
| 46 | 47 | ||
| 47 | #define show_root_type(obj) \ | 48 | #define show_root_type(obj) \ |