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

Pull f2fs updates from Jaegeuk Kim:
 "In this round, there is no special interesting feature, but we've
  investigated a couple of tuning points with respect to the I/O flow.
  Several major bug fixes and a bunch of clean-ups also have been made.

  This patch-set includes the following major enhancement patches:
   - enhance wait_on_page_writeback
   - support SEEK_DATA and SEEK_HOLE
   - enhance readahead flows
   - enhance IO flushes
   - support fiemap
   - add some tracepoints

  The other bug fixes are as follows:
   - fix to support a large volume > 2TB correctly
   - recovery bug fix wrt fallocated space
   - fix recursive lock on xattr operations
   - fix some cases on the remount flow

  And, there are a bunch of cleanups"

* tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (52 commits)
  f2fs: support f2fs_fiemap
  f2fs: avoid not to call remove_dirty_inode
  f2fs: recover fallocated space
  f2fs: fix to recover data written by dio
  f2fs: large volume support
  f2fs: avoid crash when trace f2fs_submit_page_mbio event in ra_sum_pages
  f2fs: avoid overflow when large directory feathure is enabled
  f2fs: fix recursive lock by f2fs_setxattr
  MAINTAINERS: add a co-maintainer from samsung for F2FS
  MAINTAINERS: change the email address for f2fs
  f2fs: use inode_init_owner() to simplify codes
  f2fs: avoid to use slab memory in f2fs_issue_flush for efficiency
  f2fs: add a tracepoint for f2fs_read_data_page
  f2fs: add a tracepoint for f2fs_write_{meta,node,data}_pages
  f2fs: add a tracepoint for f2fs_write_{meta,node,data}_page
  f2fs: add a tracepoint for f2fs_write_end
  f2fs: add a tracepoint for f2fs_write_begin
  f2fs: fix checkpatch warning
  f2fs: deactivate inode page if the inode is evicted
  f2fs: decrease the lock granularity during write_begin
  ...

2 files changed, 152 insertions, 2 deletions

diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index df53e1753a76..6ff0b0b42d47 100644
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -19,6 +19,7 @@
 #define F2FS_LOG_SECTORS_PER_BLOCK      3       /* 4KB: F2FS_BLKSIZE */
 #define F2FS_BLKSIZE                    4096    /* support only 4KB block */
 #define F2FS_MAX_EXTENSION              64      /* # of extension entries */
+#define F2FS_BLK_ALIGN(x)       (((x) + F2FS_BLKSIZE - 1) / F2FS_BLKSIZE)
 
 #define NULL_ADDR               ((block_t)0)    /* used as block_t addresses */
 #define NEW_ADDR                ((block_t)-1)   /* used as block_t addresses */
@@ -75,6 +76,7 @@ struct f2fs_super_block {
         __le16 volume_name[512];        /* volume name */
         __le32 extension_count;         /* # of extensions below */
         __u8 extension_list[F2FS_MAX_EXTENSION][8];     /* extension array */
+        __le32 cp_payload;
 } __packed;
 
 /*
@@ -146,6 +148,9 @@ struct f2fs_extent {
 #define ADDRS_PER_BLOCK         1018    /* Address Pointers in a Direct Block */
 #define NIDS_PER_BLOCK          1018    /* Node IDs in an Indirect Block */
 
+#define ADDRS_PER_PAGE(page, fi)        \
+        (IS_INODE(page) ? ADDRS_PER_INODE(fi) : ADDRS_PER_BLOCK)
+
 #define NODE_DIR1_BLOCK         (DEF_ADDRS_PER_INODE + 1)
 #define NODE_DIR2_BLOCK         (DEF_ADDRS_PER_INODE + 2)
 #define NODE_IND1_BLOCK         (DEF_ADDRS_PER_INODE + 3)
@@ -391,6 +396,9 @@ typedef __le32	f2fs_hash_t;
 /* MAX level for dir lookup */
 #define MAX_DIR_HASH_DEPTH      63
 
+/* MAX buckets in one level of dir */
+#define MAX_DIR_BUCKETS         (1 << ((MAX_DIR_HASH_DEPTH / 2) - 1))
+
 #define SIZE_OF_DIR_ENTRY       11      /* by byte */
 #define SIZE_OF_DENTRY_BITMAP   ((NR_DENTRY_IN_BLOCK + BITS_PER_BYTE - 1) / \
                                         BITS_PER_BYTE)
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 67f38faac589..b983990b4a9f 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -659,6 +659,66 @@ DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_read_bio,
         TP_CONDITION(bio)
 );
 
+TRACE_EVENT(f2fs_write_begin,
+
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                                unsigned int flags),
+
+        TP_ARGS(inode, pos, len, flags),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned int, len)
+                __field(unsigned int, flags)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = pos;
+                __entry->len    = len;
+                __entry->flags  = flags;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u, flags = %u",
+                show_dev_ino(__entry),
+                (unsigned long long)__entry->pos,
+                __entry->len,
+                __entry->flags)
+);
+
+TRACE_EVENT(f2fs_write_end,
+
+        TP_PROTO(struct inode *inode, loff_t pos, unsigned int len,
+                                unsigned int copied),
+
+        TP_ARGS(inode, pos, len, copied),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(loff_t, pos)
+                __field(unsigned int, len)
+                __field(unsigned int, copied)
+        ),
+
+        TP_fast_assign(
+                __entry->dev    = inode->i_sb->s_dev;
+                __entry->ino    = inode->i_ino;
+                __entry->pos    = pos;
+                __entry->len    = len;
+                __entry->copied = copied;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, pos = %llu, len = %u, copied = %u",
+                show_dev_ino(__entry),
+                (unsigned long long)__entry->pos,
+                __entry->len,
+                __entry->copied)
+);
+
 DECLARE_EVENT_CLASS(f2fs__page,
 
         TP_PROTO(struct page *page, int type),
@@ -672,6 +732,7 @@ DECLARE_EVENT_CLASS(f2fs__page,
                 __field(int, dir)
                 __field(pgoff_t, index)
                 __field(int, dirty)
+                __field(int, uptodate)
         ),
 
         TP_fast_assign(
@@ -681,14 +742,31 @@ DECLARE_EVENT_CLASS(f2fs__page,
                 __entry->dir    = S_ISDIR(page->mapping->host->i_mode);
                 __entry->index  = page->index;
                 __entry->dirty  = PageDirty(page);
+                __entry->uptodate = PageUptodate(page);
         ),
 
-        TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, dirty = %d",
+        TP_printk("dev = (%d,%d), ino = %lu, %s, %s, index = %lu, "
+                "dirty = %d, uptodate = %d",
                 show_dev_ino(__entry),
                 show_block_type(__entry->type),
                 show_file_type(__entry->dir),
                 (unsigned long)__entry->index,
-                __entry->dirty)
+                __entry->dirty,
+                __entry->uptodate)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_writepage,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
+);
+
+DEFINE_EVENT(f2fs__page, f2fs_readpage,
+
+        TP_PROTO(struct page *page, int type),
+
+        TP_ARGS(page, type)
 );
 
 DEFINE_EVENT(f2fs__page, f2fs_set_page_dirty,
@@ -705,6 +783,70 @@ DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
         TP_ARGS(page, type)
 );
 
+TRACE_EVENT(f2fs_writepages,
+
+        TP_PROTO(struct inode *inode, struct writeback_control *wbc, int type),
+
+        TP_ARGS(inode, wbc, type),
+
+        TP_STRUCT__entry(
+                __field(dev_t,  dev)
+                __field(ino_t,  ino)
+                __field(int,    type)
+                __field(int,    dir)
+                __field(long,   nr_to_write)
+                __field(long,   pages_skipped)
+                __field(loff_t, range_start)
+                __field(loff_t, range_end)
+                __field(pgoff_t, writeback_index)
+                __field(int,    sync_mode)
+                __field(char,   for_kupdate)
+                __field(char,   for_background)
+                __field(char,   tagged_writepages)
+                __field(char,   for_reclaim)
+                __field(char,   range_cyclic)
+                __field(char,   for_sync)
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = inode->i_sb->s_dev;
+                __entry->ino            = inode->i_ino;
+                __entry->type           = type;
+                __entry->dir            = S_ISDIR(inode->i_mode);
+                __entry->nr_to_write    = wbc->nr_to_write;
+                __entry->pages_skipped  = wbc->pages_skipped;
+                __entry->range_start    = wbc->range_start;
+                __entry->range_end      = wbc->range_end;
+                __entry->writeback_index = inode->i_mapping->writeback_index;
+                __entry->sync_mode      = wbc->sync_mode;
+                __entry->for_kupdate    = wbc->for_kupdate;
+                __entry->for_background = wbc->for_background;
+                __entry->tagged_writepages      = wbc->tagged_writepages;
+                __entry->for_reclaim    = wbc->for_reclaim;
+                __entry->range_cyclic   = wbc->range_cyclic;
+                __entry->for_sync       = wbc->for_sync;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, %s, %s, nr_to_write %ld, "
+                "skipped %ld, start %lld, end %lld, wb_idx %lu, sync_mode %d, "
+                "kupdate %u background %u tagged %u reclaim %u cyclic %u sync %u",
+                show_dev_ino(__entry),
+                show_block_type(__entry->type),
+                show_file_type(__entry->dir),
+                __entry->nr_to_write,
+                __entry->pages_skipped,
+                __entry->range_start,
+                __entry->range_end,
+                (unsigned long)__entry->writeback_index,
+                __entry->sync_mode,
+                __entry->for_kupdate,
+                __entry->for_background,
+                __entry->tagged_writepages,
+                __entry->for_reclaim,
+                __entry->range_cyclic,
+                __entry->for_sync)
+);
+
 TRACE_EVENT(f2fs_submit_page_mbio,
 
         TP_PROTO(struct page *page, int rw, int type, block_t blk_addr),