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

Pull f2fs updates from Jaegeuk Kim:
 "Most part of the patches include enhancing the stability and
  performance of in-memory extent caches feature.

  In addition, it introduces several new features and configurable
  points:
   - F2FS_GOING_DOWN_METAFLUSH ioctl to test power failures
   - F2FS_IOC_WRITE_CHECKPOINT ioctl to trigger checkpoint by users
   - background_gc=sync mount option to do gc synchronously
   - periodic checkpoints
   - sysfs entry to control readahead blocks for free nids

  And the following bug fixes have been merged.
   - fix SSA corruption by collapse/insert_range
   - correct a couple of gc behaviors
   - fix the results of f2fs_map_blocks
   - fix error case handling of volatile/atomic writes"

* tag 'for-f2fs-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (54 commits)
  f2fs: fix to skip shrinking extent nodes
  f2fs: fix error path of ->symlink
  f2fs: fix to clear GCed flag for atomic written page
  f2fs: don't need to submit bio on error case
  f2fs: fix leakage of inmemory atomic pages
  f2fs: refactor __find_rev_next_{zero}_bit
  f2fs: support fiemap for inline_data
  f2fs: flush dirty data for bmap
  f2fs: relocate the tracepoint for background_gc
  f2fs crypto: fix racing of accessing encrypted page among
  f2fs: export ra_nid_pages to sysfs
  f2fs: readahead for free nids building
  f2fs: support lower priority asynchronous readahead in ra_meta_pages
  f2fs: don't tag REQ_META for temporary non-meta pages
  f2fs: add a tracepoint for f2fs_read_data_pages
  f2fs: set GFP_NOFS for grab_cache_page
  f2fs: fix SSA updates resulting in corruption
  Revert "f2fs: do not skip dentry block writes"
  f2fs: add F2FS_GOING_DOWN_METAFLUSH to test power-failure
  f2fs: merge meta writes as many possible
  ...

1 files changed, 64 insertions, 5 deletions

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index a01946514b5a..00b4a6308249 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -514,6 +514,34 @@ TRACE_EVENT(f2fs_map_blocks,
                 __entry->ret)
 );
 
+TRACE_EVENT(f2fs_background_gc,
+
+        TP_PROTO(struct super_block *sb, long wait_ms,
+                        unsigned int prefree, unsigned int free),
+
+        TP_ARGS(sb, wait_ms, prefree, free),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(long,   wait_ms)
+                __field(unsigned int,   prefree)
+                __field(unsigned int,   free)
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = sb->s_dev;
+                __entry->wait_ms        = wait_ms;
+                __entry->prefree        = prefree;
+                __entry->free           = free;
+        ),
+
+        TP_printk("dev = (%d,%d), wait_ms = %ld, prefree = %u, free = %u",
+                show_dev(__entry),
+                __entry->wait_ms,
+                __entry->prefree,
+                __entry->free)
+);
+
 TRACE_EVENT(f2fs_get_victim,
 
         TP_PROTO(struct super_block *sb, int type, int gc_type,
@@ -1000,6 +1028,32 @@ TRACE_EVENT(f2fs_writepages,
                 __entry->for_sync)
 );
 
+TRACE_EVENT(f2fs_readpages,
+
+        TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage),
+
+        TP_ARGS(inode, page, nrpage),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(pgoff_t,        start)
+                __field(unsigned int,   nrpage)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->start  = page->index;
+                __entry->nrpage = nrpage;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, start = %lu nrpage = %u",
+                show_dev_ino(__entry),
+                (unsigned long)__entry->start,
+                __entry->nrpage)
+);
+
 TRACE_EVENT(f2fs_write_checkpoint,
 
         TP_PROTO(struct super_block *sb, int reason, char *msg),
@@ -1132,17 +1186,19 @@ TRACE_EVENT_CONDITION(f2fs_lookup_extent_tree_end,
                 __entry->len)
 );
 
-TRACE_EVENT(f2fs_update_extent_tree,
+TRACE_EVENT(f2fs_update_extent_tree_range,
 
-        TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr),
+        TP_PROTO(struct inode *inode, unsigned int pgofs, block_t blkaddr,
+                                                unsigned int len),
 
-        TP_ARGS(inode, pgofs, blkaddr),
+        TP_ARGS(inode, pgofs, blkaddr, len),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
                 __field(ino_t,  ino)
                 __field(unsigned int, pgofs)
                 __field(u32, blk)
+                __field(unsigned int, len)
         ),
 
         TP_fast_assign(
@@ -1150,12 +1206,15 @@ TRACE_EVENT(f2fs_update_extent_tree,
                 __entry->ino = inode->i_ino;
                 __entry->pgofs = pgofs;
                 __entry->blk = blkaddr;
+                __entry->len = len;
         ),
 
-        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, blkaddr = %u",
+        TP_printk("dev = (%d,%d), ino = %lu, pgofs = %u, "
+                                        "blkaddr = %u, len = %u",
                 show_dev_ino(__entry),
                 __entry->pgofs,
-                __entry->blk)
+                __entry->blk,
+                __entry->len)
 );
 
 TRACE_EVENT(f2fs_shrink_extent_tree,