ext4: use ->invalidatepage() length argument

[mirror_ubuntu-zesty-kernel.git] / include / trace / events / ext4.h

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index d0e686402df883d89e474a63374cdd1aa4c73ba6..dcfce96c08a8fdcb48bd1a85d76794c064b8be85 100644 (file)
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -444,16 +444,16 @@ DEFINE_EVENT(ext4__page_op, ext4_releasepage,
 );
 
 DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
-       TP_PROTO(struct page *page, unsigned long offset),
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_ARGS(page, offset),
+       TP_ARGS(page, offset, length),
 
        TP_STRUCT__entry(
                __field(        dev_t,  dev                     )
                __field(        ino_t,  ino                     )
                __field(        pgoff_t, index                  )
-               __field(        unsigned long, offset           )
-
+               __field(        unsigned int, offset            )
+               __field(        unsigned int, length            )
        ),
 
        TP_fast_assign(
@@ -461,24 +461,26 @@ DECLARE_EVENT_CLASS(ext4_invalidatepage_op,
                __entry->ino    = page->mapping->host->i_ino;
                __entry->index  = page->index;
                __entry->offset = offset;
+               __entry->length = length;
        ),
 
-       TP_printk("dev %d,%d ino %lu page_index %lu offset %lu",
+       TP_printk("dev %d,%d ino %lu page_index %lu offset %u length %u",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long) __entry->ino,
-                 (unsigned long) __entry->index, __entry->offset)
+                 (unsigned long) __entry->index,
+                 __entry->offset, __entry->length)
 );
 
 DEFINE_EVENT(ext4_invalidatepage_op, ext4_invalidatepage,
-       TP_PROTO(struct page *page, unsigned long offset),
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_ARGS(page, offset)
+       TP_ARGS(page, offset, length)
 );
 
 DEFINE_EVENT(ext4_invalidatepage_op, ext4_journalled_invalidatepage,
-       TP_PROTO(struct page *page, unsigned long offset),
+       TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
 
-       TP_ARGS(page, offset)
+       TP_ARGS(page, offset, length)
 );
 
 TRACE_EVENT(ext4_discard_blocks,
@@ -2139,7 +2141,7 @@ TRACE_EVENT(ext4_es_remove_extent,
                  __entry->lblk, __entry->len)
 );
 
-TRACE_EVENT(ext4_es_find_delayed_extent_enter,
+TRACE_EVENT(ext4_es_find_delayed_extent_range_enter,
        TP_PROTO(struct inode *inode, ext4_lblk_t lblk),
 
        TP_ARGS(inode, lblk),
@@ -2161,7 +2163,7 @@ TRACE_EVENT(ext4_es_find_delayed_extent_enter,
                  (unsigned long) __entry->ino, __entry->lblk)
 );
 
-TRACE_EVENT(ext4_es_find_delayed_extent_exit,
+TRACE_EVENT(ext4_es_find_delayed_extent_range_exit,
        TP_PROTO(struct inode *inode, struct extent_status *es),
 
        TP_ARGS(inode, es),