2 files changed, 125 insertions, 20 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 3efc43f3f162..1be23d9fdacb 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1096,7 +1096,6 @@ extern int	 jbd2_journal_get_undo_access(handle_t *, struct buffer_head *);
 void             jbd2_journal_set_triggers(struct buffer_head *,
                                            struct jbd2_buffer_trigger_type *type);
 extern int       jbd2_journal_dirty_metadata (handle_t *, struct buffer_head *);
-extern void      jbd2_journal_release_buffer (handle_t *, struct buffer_head *);
 extern int       jbd2_journal_forget (handle_t *, struct buffer_head *);
 extern void      journal_sync_buffer (struct buffer_head *);
 extern void      jbd2_journal_invalidatepage(journal_t *,
@@ -1303,15 +1302,21 @@ static inline int jbd_space_needed(journal_t *journal)
 
 extern int jbd_blocks_per_page(struct inode *inode);
 
+/* JBD uses a CRC32 checksum */
+#define JBD_MAX_CHECKSUM_SIZE 4
+
 static inline u32 jbd2_chksum(journal_t *journal, u32 crc,
                               const void *address, unsigned int length)
 {
         struct {
                 struct shash_desc shash;
-                char ctx[crypto_shash_descsize(journal->j_chksum_driver)];
+                char ctx[JBD_MAX_CHECKSUM_SIZE];
         } desc;
         int err;
 
+        BUG_ON(crypto_shash_descsize(journal->j_chksum_driver) >
+                JBD_MAX_CHECKSUM_SIZE);
+
         desc.shash.tfm = journal->j_chksum_driver;
         desc.shash.flags = 0;
         *(u32 *)desc.ctx = crc;
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index d49b285385e8..f6372b011366 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -15,6 +15,7 @@ struct ext4_inode_info;
 struct mpage_da_data;
 struct ext4_map_blocks;
 struct ext4_extent;
+struct extent_status;
 
 #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode))
 
@@ -1519,10 +1520,9 @@ DEFINE_EVENT(ext4__map_blocks_enter, ext4_ind_map_blocks_enter,
 );
 
 DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned int len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret),
+        TP_ARGS(inode, map, ret),
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev             )
@@ -1530,37 +1530,37 @@ DECLARE_EVENT_CLASS(ext4__map_blocks_exit,
                 __field(        ext4_fsblk_t,   pblk            )
                 __field(        ext4_lblk_t,    lblk            )
                 __field(        unsigned int,   len             )
+                __field(        unsigned int,   flags           )
                 __field(        int,            ret             )
         ),
 
         TP_fast_assign(
                 __entry->dev    = inode->i_sb->s_dev;
                 __entry->ino    = inode->i_ino;
-                __entry->pblk   = pblk;
-                __entry->lblk   = lblk;
-                __entry->len    = len;
+                __entry->pblk   = map->m_pblk;
+                __entry->lblk   = map->m_lblk;
+                __entry->len    = map->m_len;
+                __entry->flags  = map->m_flags;
                 __entry->ret    = ret;
         ),
 
-        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u ret %d",
+        TP_printk("dev %d,%d ino %lu lblk %u pblk %llu len %u flags %x ret %d",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
                   __entry->lblk, __entry->pblk,
-                  __entry->len, __entry->ret)
+                  __entry->len, __entry->flags, __entry->ret)
 );
 
 DEFINE_EVENT(ext4__map_blocks_exit, ext4_ext_map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret)
+        TP_ARGS(inode, map, ret)
 );
 
 DEFINE_EVENT(ext4__map_blocks_exit, ext4_ind_map_blocks_exit,
-        TP_PROTO(struct inode *inode, ext4_lblk_t lblk,
-                 ext4_fsblk_t pblk, unsigned len, int ret),
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret),
 
-        TP_ARGS(inode, lblk, pblk, len, ret)
+        TP_ARGS(inode, map, ret)
 );
 
 TRACE_EVENT(ext4_ext_load_extent,
@@ -1680,10 +1680,10 @@ DEFINE_EVENT(ext4__trim, ext4_trim_all_free,
 );
 
 TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
-        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map,
+        TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags,
                  unsigned int allocated, ext4_fsblk_t newblock),
 
-        TP_ARGS(inode, map, allocated, newblock),
+        TP_ARGS(inode, map, flags, allocated, newblock),
 
         TP_STRUCT__entry(
                 __field(        dev_t,          dev             )
@@ -1699,7 +1699,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
         TP_fast_assign(
                 __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
-                __entry->flags          = map->m_flags;
+                __entry->flags          = flags;
                 __entry->lblk           = map->m_lblk;
                 __entry->pblk           = map->m_pblk;
                 __entry->len            = map->m_len;
@@ -1707,7 +1707,7 @@ TRACE_EVENT(ext4_ext_handle_uninitialized_extents,
                 __entry->newblk         = newblock;
         ),
 
-        TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %d"
+        TP_printk("dev %d,%d ino %lu m_lblk %u m_pblk %llu m_len %u flags %x "
                   "allocated %d newblock %llu",
                   MAJOR(__entry->dev), MINOR(__entry->dev),
                   (unsigned long) __entry->ino,
@@ -2055,6 +2055,106 @@ TRACE_EVENT(ext4_ext_remove_space_done,
                   (unsigned short) __entry->eh_entries)
 );
 
+TRACE_EVENT(ext4_es_insert_extent,
+        TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len),
+
+        TP_ARGS(inode, start, len),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        loff_t, start                   )
+                __field(        loff_t, len                     )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = start;
+                __entry->len    = len;
+        ),