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:
  ext4: Add new ext4 inode tracepoints
  ext4: Don't call sb_issue_discard() in ext4_free_blocks()
  ext4: do not try to grab the s_umount semaphore in ext4_quota_off
  ext4: fix potential race when freeing ext4_io_page structures
  ext4: handle writeback of inodes which are being freed
  ext4: initialize the percpu counters before replaying the journal
  ext4: "ret" may be used uninitialized in ext4_lazyinit_thread()
  ext4: fix lazyinit hang after removing request

diff --combined fs/ext4/inode.c
index 4d78342,846e1e9..bdbe699
--- 1/fs/ext4/inode.c
--- 2/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -53,6 -53,7 +53,7 @@@
  static inline int ext4_begin_ordered_truncate(struct inode *inode,
                                              loff_t new_size)
  {
+       trace_ext4_begin_ordered_truncate(inode, new_size);
        return jbd2_journal_begin_ordered_truncate(
                                        EXT4_SB(inode->i_sb)->s_journal,
                                        &EXT4_I(inode)->jinode,
@@@ -178,6 -179,7 +179,7 @@@ void ext4_evict_inode(struct inode *ino
        handle_t *handle;
        int err;
  
+       trace_ext4_evict_inode(inode);
        if (inode->i_nlink) {
                truncate_inode_pages(&inode->i_data, 0);
                goto no_delete;
@@@ -5410,7 -5412,9 +5412,7 @@@ int ext4_getattr(struct vfsmount *mnt, 
         * will return the blocks that include the delayed allocation
         * blocks for this file.
         */
 -      spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
        delalloc_blocks = EXT4_I(inode)->i_reserved_data_blocks;
 -      spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
  
        stat->blocks += (delalloc_blocks << inode->i_sb->s_blocksize_bits)>>9;
        return 0;
@@@ -5647,6 -5651,7 +5649,7 @@@ int ext4_mark_inode_dirty(handle_t *han
        int err, ret;
  
        might_sleep();
+       trace_ext4_mark_inode_dirty(inode, _RET_IP_);
        err = ext4_reserve_inode_write(handle, inode, &iloc);
        if (ext4_handle_valid(handle) &&
            EXT4_I(inode)->i_extra_isize < sbi->s_want_extra_isize &&