Merge tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

Pull f2fs updates from Jaegeuk Kim:
 "This series includes patches to:
   - add nobarrier mount option
   - support tmpfile and rename2
   - enhance the fdatasync behavior
   - fix the error path
   - fix the recovery routine
   - refactor a part of the checkpoint procedure
   - reduce some lock contentions"

* tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (40 commits)
  f2fs: use for_each_set_bit to simplify the code
  f2fs: add f2fs_balance_fs for expand_inode_data
  f2fs: invalidate xattr node page when evict inode
  f2fs: avoid skipping recover_inline_xattr after recover_inline_data
  f2fs: add tracepoint for f2fs_direct_IO
  f2fs: reduce competition among node page writes
  f2fs: fix coding style
  f2fs: remove redundant lines in allocate_data_block
  f2fs: add tracepoint for f2fs_issue_flush
  f2fs: avoid retrying wrong recovery routine when error was occurred
  f2fs: test before set/clear bits
  f2fs: fix wrong condition for unlikely
  f2fs: enable in-place-update for fdatasync
  f2fs: skip unnecessary data writes during fsync
  f2fs: add info of appended or updated data writes
  f2fs: use radix_tree for ino management
  f2fs: add infra for ino management
  f2fs: punch the core function for inode management
  f2fs: add nobarrier mount option
  f2fs: fix to put root inode in error path of fill_super
  ...

1 files changed, 87 insertions, 0 deletions

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index b983990b4a9f..d06d44363fea 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -587,6 +587,69 @@ TRACE_EVENT(f2fs_fallocate,
                 __entry->ret)
 );
 
+TRACE_EVENT(f2fs_direct_IO_enter,
+
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len, int rw),
+
+        TP_ARGS(inode, offset, len, rw),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned long,  len)
+                __field(int,    rw)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu rw = %d",
+                show_dev_ino(__entry),
+                __entry->pos,
+                __entry->len,
+                __entry->rw)
+);
+
+TRACE_EVENT(f2fs_direct_IO_exit,
+
+        TP_PROTO(struct inode *inode, loff_t offset, unsigned long len,
+                 int rw, int ret),
+
+        TP_ARGS(inode, offset, len, rw, ret),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned long,  len)
+                __field(int,    rw)
+                __field(int,    ret)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = offset;
+                __entry->len    = len;
+                __entry->rw     = rw;
+                __entry->ret    = ret;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu pos = %lld len = %lu "
+                "rw = %d ret = %d",
+                show_dev_ino(__entry),
+                __entry->pos,
+                __entry->len,
+                __entry->rw,
+                __entry->ret)
+);
+
 TRACE_EVENT(f2fs_reserve_new_block,
 
         TP_PROTO(struct inode *inode, nid_t nid, unsigned int ofs_in_node),
@@ -926,6 +989,30 @@ TRACE_EVENT(f2fs_issue_discard,
                 (unsigned long long)__entry->blkstart,
                 (unsigned long long)__entry->blklen)
 );
+
+TRACE_EVENT(f2fs_issue_flush,
+
+        TP_PROTO(struct super_block *sb, bool nobarrier, bool flush_merge),
+
+        TP_ARGS(sb, nobarrier, flush_merge),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(bool, nobarrier)
+                __field(bool, flush_merge)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = sb->s_dev;
+                __entry->nobarrier = nobarrier;
+                __entry->flush_merge = flush_merge;
+        ),
+
+        TP_printk("dev = (%d,%d), %s %s",
+                show_dev(__entry),
+                __entry->nobarrier ? "skip (nobarrier)" : "issue",
+                __entry->flush_merge ? " with flush_merge" : "")
+);
 #endif /* _TRACE_F2FS_H */
 
  /* This part must be outside protection */