diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-01-10 11:54:07 -0500 |
| commit | ff9cb1c4eead5e4c292e75cd3170a82d66944101 (patch) | |
| tree | cdb132a39e550a9b7b28ea67544cb86cd6ebdb6e /include/trace | |
| parent | e4e11180dfa545233e5145919b75b7fac88638df (diff) | |
| parent | d50f2ab6f050311dbf7b8f5501b25f0bf64a439b (diff) | |
Merge branch 'for_linus' into for_linus_merged
Conflicts:
fs/ext4/ioctl.c
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/ext4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 748ff7cbe555..319538bf17d2 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h | |||
| @@ -573,9 +573,9 @@ TRACE_EVENT(ext4_mb_release_inode_pa, | |||
| 573 | ); | 573 | ); |
| 574 | 574 | ||
| 575 | TRACE_EVENT(ext4_mb_release_group_pa, | 575 | TRACE_EVENT(ext4_mb_release_group_pa, |
| 576 | TP_PROTO(struct ext4_prealloc_space *pa), | 576 | TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa), |
| 577 | 577 | ||
| 578 | TP_ARGS(pa), | 578 | TP_ARGS(sb, pa), |
| 579 | 579 | ||
| 580 | TP_STRUCT__entry( | 580 | TP_STRUCT__entry( |
| 581 | __field( dev_t, dev ) | 581 | __field( dev_t, dev ) |
| @@ -585,7 +585,7 @@ TRACE_EVENT(ext4_mb_release_group_pa, | |||
| 585 | ), | 585 | ), |
| 586 | 586 | ||
| 587 | TP_fast_assign( | 587 | TP_fast_assign( |
| 588 | __entry->dev = pa->pa_inode->i_sb->s_dev; | 588 | __entry->dev = sb->s_dev; |
| 589 | __entry->pa_pstart = pa->pa_pstart; | 589 | __entry->pa_pstart = pa->pa_pstart; |
| 590 | __entry->pa_len = pa->pa_len; | 590 | __entry->pa_len = pa->pa_len; |
| 591 | ), | 591 | ), |