Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (47 commits)
  ext4: Fix potential fiemap deadlock (mmap_sem vs. i_data_sem)
  ext4: Do not override ext2 or ext3 if built they are built as modules
  jbd2: Export jbd2_log_start_commit to fix ext4 build
  ext4: Fix insufficient checks in EXT4_IOC_MOVE_EXT
  ext4: Wait for proper transaction commit on fsync
  ext4: fix incorrect block reservation on quota transfer.
  ext4: quota macros cleanup
  ext4: ext4_get_reserved_space() must return bytes instead of blocks
  ext4: remove blocks from inode prealloc list on failure
  ext4: wait for log to commit when umounting
  ext4: Avoid data / filesystem corruption when write fails to copy data
  ext4: Use ext4 file system driver for ext2/ext3 file system mounts
  ext4: Return the PTR_ERR of the correct pointer in setup_new_group_blocks()
  jbd2: Add ENOMEM checking in and for jbd2_journal_write_metadata_buffer()
  ext4: remove unused parameter wbc from __ext4_journalled_writepage()
  ext4: remove encountered_congestion trace
  ext4: move_extent_per_page() cleanup
  ext4: initialize moved_len before calling ext4_move_extents()
  ext4: Fix double-free of blocks with EXT4_IOC_MOVE_EXT
  ext4: use ext4_data_block_valid() in ext4_free_blocks()
  ...

1 files changed, 40 insertions, 14 deletions

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 318f76535bd..d0b6cd3afb2 100644
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -38,7 +38,7 @@ TRACE_EVENT(ext4_free_inode,
                 __entry->blocks = inode->i_blocks;
         ),
 
-        TP_printk("dev %s ino %lu mode %d uid %u gid %u blocks %llu",
+        TP_printk("dev %s ino %lu mode 0%o uid %u gid %u blocks %llu",
                   jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
                   __entry->mode, __entry->uid, __entry->gid,
                   (unsigned long long) __entry->blocks)
@@ -61,7 +61,7 @@ TRACE_EVENT(ext4_request_inode,
                 __entry->mode   = mode;
         ),
 
-        TP_printk("dev %s dir %lu mode %d",
+        TP_printk("dev %s dir %lu mode 0%o",
                   jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->dir,
                   __entry->mode)
 );
@@ -85,7 +85,7 @@ TRACE_EVENT(ext4_allocate_inode,
                 __entry->mode   = mode;
         ),
 
-        TP_printk("dev %s ino %lu dir %lu mode %d",
+        TP_printk("dev %s ino %lu dir %lu mode 0%o",
                   jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
                   (unsigned long) __entry->dir, __entry->mode)
 );
@@ -305,7 +305,6 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __field(        int,    ret                     )
                 __field(        int,    pages_written           )
                 __field(        long,   pages_skipped           )
-                __field(        char,   encountered_congestion  )
                 __field(        char,   more_io                 )       
                 __field(        char,   no_nrwrite_index_update )
                 __field(       pgoff_t, writeback_index         )
@@ -317,17 +316,16 @@ TRACE_EVENT(ext4_da_writepages_result,
                 __entry->ret            = ret;
                 __entry->pages_written  = pages_written;
                 __entry->pages_skipped  = wbc->pages_skipped;
-                __entry->encountered_congestion = wbc->encountered_congestion;
                 __entry->more_io        = wbc->more_io;
                 __entry->no_nrwrite_index_update = wbc->no_nrwrite_index_update;
                 __entry->writeback_index = inode->i_mapping->writeback_index;
         ),
 
-        TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld congestion %d more_io %d no_nrwrite_index_update %d writeback_index %lu",
+        TP_printk("dev %s ino %lu ret %d pages_written %d pages_skipped %ld more_io %d no_nrwrite_index_update %d writeback_index %lu",
                   jbd2_dev_to_name(__entry->dev),
                   (unsigned long) __entry->ino, __entry->ret,
                   __entry->pages_written, __entry->pages_skipped,
-                  __entry->encountered_congestion, __entry->more_io,
+                  __entry->more_io,
                   __entry->no_nrwrite_index_update,
                   (unsigned long) __entry->writeback_index)
 );
@@ -591,30 +589,32 @@ TRACE_EVENT(ext4_allocate_blocks,
 
 TRACE_EVENT(ext4_free_blocks,
         TP_PROTO(struct inode *inode, __u64 block, unsigned long count,
-                        int metadata),
+                 int flags),
 
-        TP_ARGS(inode, block, count, metadata),
+        TP_ARGS(inode, block, count, flags),
 
         TP_STRUCT__entry(
                 __field(        dev_t,  dev                     )
                 __field(        ino_t,  ino                     )
+                __field(      umode_t, mode                     )
                 __field(        __u64,  block                   )
                 __field(        unsigned long,  count           )
-                __field(        int,    metadata                )
-
+                __field(         int,   flags                   )
         ),
 
         TP_fast_assign(
                 __entry->dev            = inode->i_sb->s_dev;
                 __entry->ino            = inode->i_ino;
+                __entry->mode           = inode->i_mode;
                 __entry->block          = block;
                 __entry->count          = count;
-                __entry->metadata       = metadata;
+                __entry->flags          = flags;
         ),
 
-        TP_printk("dev %s ino %lu block %llu count %lu metadata %d",
+        TP_printk("dev %s ino %lu mode 0%o block %llu count %lu flags %d",
                   jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
-                  __entry->block, __entry->count, __entry->metadata)
+                  __entry->mode, __entry->block, __entry->count,
+                  __entry->flags)
 );
 
 TRACE_EVENT(ext4_sync_file,
@@ -848,6 +848,32 @@ TRACE_EVENT(ext4_mballoc_free,
                   __entry->result_len, __entry->result_logical)
 );
 
+TRACE_EVENT(ext4_forget,
+        TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
+
+        TP_ARGS(inode, is_metadata, block),
+
+        TP_STRUCT__entry(
+                __field(        dev_t,  dev                     )
+                __field(        ino_t,  ino                     )
+                __field(        umode_t, mode                   )
+                __field(        int,    is_metadata             )
+                __field(        __u64,  block                   )
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->mode   = inode->i_mode;
+                __entry->is_metadata = is_metadata;
+                __entry->block  = block;
+        ),
+
+        TP_printk("dev %s ino %lu mode 0%o is_metadata %d block %llu",
+                  jbd2_dev_to_name(__entry->dev), (unsigned long) __entry->ino,
+                  __entry->mode, __entry->is_metadata, __entry->block)
+);
+
 #endif /* _TRACE_EXT4_H */
 
 /* This part must be outside protection */