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) | |
| download | linux-ff9cb1c4eead5e4c292e75cd3170a82d66944101.tar.bz2 | |
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, ); TRACE_EVENT(ext4_mb_release_group_pa, - TP_PROTO(struct ext4_prealloc_space *pa), + TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa), - TP_ARGS(pa), + TP_ARGS(sb, pa), TP_STRUCT__entry( __field( dev_t, dev ) @@ -585,7 +585,7 @@ TRACE_EVENT(ext4_mb_release_group_pa, ), TP_fast_assign( - __entry->dev = pa->pa_inode->i_sb->s_dev; + __entry->dev = sb->s_dev; __entry->pa_pstart = pa->pa_pstart; __entry->pa_len = pa->pa_len; ), |