Merge branch 'for_linus' into for_linus_merged

Conflicts:
	fs/ext4/ioctl.c

2 files changed, 4 insertions, 3 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 2092ea21e469..5557baefed60 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1151,6 +1151,7 @@ extern int	jbd2_journal_set_revoke(journal_t *, unsigned long long, tid_t);
 extern int      jbd2_journal_test_revoke(journal_t *, unsigned long long, tid_t);
 extern void     jbd2_journal_clear_revoke(journal_t *);
 extern void     jbd2_journal_switch_revoke_table(journal_t *journal);
+extern void     jbd2_clear_buffer_revoked_flags(journal_t *journal);
 
 /*
  * The log thread user interface:
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;
         ),