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

Pull f2fs updates from Jaegeuk Kim:
 "Major changes are to:
   - add f2fs_io_tracer and F2FS_IOC_GETVERSION
   - fix wrong acl assignment from parent
   - fix accessing wrong data blocks
   - fix wrong condition check for f2fs_sync_fs
   - align start block address for direct_io
   - add and refactor the readahead flows of FS metadata
   - refactor atomic and volatile write policies

  But most of patches are for clean-ups and minor bug fixes.  Some of
  them refactor old code too"

* tag 'for-f2fs-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (64 commits)
  f2fs: use spinlock for segmap_lock instead of rwlock
  f2fs: fix accessing wrong indexed data blocks
  f2fs: avoid variable length array
  f2fs: fix sparse warnings
  f2fs: allocate data blocks in advance for f2fs_direct_IO
  f2fs: introduce macros to convert bytes and blocks in f2fs
  f2fs: call set_buffer_new for get_block
  f2fs: check node page contents all the time
  f2fs: avoid data offset overflow when lseeking huge file
  f2fs: fix to use highmem for pages of newly created directory
  f2fs: introduce a batched trim
  f2fs: merge {invalidate,release}page for meta/node/data pages
  f2fs: show the number of writeback pages in stat
  f2fs: keep PagePrivate during releasepage
  f2fs: should fail mount when trying to recover data on read-only dev
  f2fs: split UMOUNT and FASTBOOT flags
  f2fs: avoid write_checkpoint if f2fs is mounted readonly
  f2fs: support norecovery mount option
  f2fs: fix not to drop mount options when retrying fill_super
  f2fs: merge flags in struct f2fs_sb_info
  ...

1 files changed, 70 insertions, 78 deletions

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index bbc4de9baef7..5422dbfaf97d 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -72,6 +72,7 @@
 #define show_cpreason(type)                                             \
         __print_symbolic(type,                                          \
                 { CP_UMOUNT,    "Umount" },                             \
+                { CP_FASTBOOT,  "Fastboot" },                           \
                 { CP_SYNC,      "Sync" },                               \
                 { CP_DISCARD,   "Discard" })
 
@@ -148,14 +149,14 @@ DEFINE_EVENT(f2fs__inode, f2fs_sync_file_enter,
 
 TRACE_EVENT(f2fs_sync_file_exit,
 
-        TP_PROTO(struct inode *inode, bool need_cp, int datasync, int ret),
+        TP_PROTO(struct inode *inode, int need_cp, int datasync, int ret),
 
         TP_ARGS(inode, need_cp, datasync, ret),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
                 __field(ino_t,  ino)
-                __field(bool,   need_cp)
+                __field(int,    need_cp)
                 __field(int,    datasync)
                 __field(int,    ret)
         ),
@@ -190,7 +191,7 @@ TRACE_EVENT(f2fs_sync_fs,
 
         TP_fast_assign(
                 __entry->dev    = sb->s_dev;
-                __entry->dirty  = F2FS_SB(sb)->s_dirty;
+                __entry->dirty  = is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY);
                 __entry->wait   = wait;
         ),
 
@@ -440,38 +441,6 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
                 __entry->err)
 );
 
-TRACE_EVENT_CONDITION(f2fs_submit_page_bio,
-
-        TP_PROTO(struct page *page, sector_t blkaddr, int type),
-
-        TP_ARGS(page, blkaddr, type),
-
-        TP_CONDITION(page->mapping),
-
-        TP_STRUCT__entry(
-                __field(dev_t,  dev)
-                __field(ino_t,  ino)
-                __field(pgoff_t,        index)
-                __field(sector_t,       blkaddr)
-                __field(int,    type)
-        ),
-
-        TP_fast_assign(
-                __entry->dev            = page->mapping->host->i_sb->s_dev;
-                __entry->ino            = page->mapping->host->i_ino;
-                __entry->index          = page->index;
-                __entry->blkaddr        = blkaddr;
-                __entry->type           = type;
-        ),
-
-        TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
-                "blkaddr = 0x%llx, bio_type = %s%s",
-                show_dev_ino(__entry),
-                (unsigned long)__entry->index,
-                (unsigned long long)__entry->blkaddr,
-                show_bio_type(__entry->type))
-);
-
 TRACE_EVENT(f2fs_get_data_block,
         TP_PROTO(struct inode *inode, sector_t iblock,
                                 struct buffer_head *bh, int ret),
@@ -680,11 +649,63 @@ TRACE_EVENT(f2fs_reserve_new_block,
                 __entry->ofs_in_node)
 );
 
+DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(ino_t, ino)
+                __field(pgoff_t, index)
+                __field(block_t, blkaddr)
+                __field(int, rw)
+                __field(int, type)
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = page->mapping->host->i_sb->s_dev;
+                __entry->ino            = page->mapping->host->i_ino;
+                __entry->index          = page->index;
+                __entry->blkaddr        = fio->blk_addr;
+                __entry->rw             = fio->rw;
+                __entry->type           = fio->type;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
+                "blkaddr = 0x%llx, rw = %s%s, type = %s",
+                show_dev_ino(__entry),
+                (unsigned long)__entry->index,
+                (unsigned long long)__entry->blkaddr,
+                show_bio_type(__entry->rw),
+                show_block_type(__entry->type))
+);
+
+DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_bio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_CONDITION(page->mapping)
+);
+
+DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_mbio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_CONDITION(page->mapping)
+);
+
 DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
@@ -696,8 +717,8 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
         TP_fast_assign(
                 __entry->dev            = sb->s_dev;
-                __entry->rw             = rw;
-                __entry->type           = type;
+                __entry->rw             = fio->rw;
+                __entry->type           = fio->type;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->size           = bio->bi_iter.bi_size;
         ),
@@ -712,18 +733,20 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
 DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_write_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                        struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_CONDITION(bio)
 );
 
 DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_read_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                        struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_CONDITION(bio)
 );
@@ -916,38 +939,6 @@ TRACE_EVENT(f2fs_writepages,
                 __entry->for_sync)
 );
 
-TRACE_EVENT(f2fs_submit_page_mbio,
-
-        TP_PROTO(struct page *page, int rw, int type, block_t blk_addr),
-
-        TP_ARGS(page, rw, type, blk_addr),
-
-        TP_STRUCT__entry(
-                __field(dev_t,  dev)
-                __field(ino_t,  ino)
-                __field(int, rw)
-                __field(int, type)
-                __field(pgoff_t, index)
-                __field(block_t, block)
-        ),
-
-        TP_fast_assign(
-                __entry->dev    = page->mapping->host->i_sb->s_dev;
-                __entry->ino    = page->mapping->host->i_ino;
-                __entry->rw     = rw;
-                __entry->type   = type;
-                __entry->index  = page->index;
-                __entry->block  = blk_addr;
-        ),
-
-        TP_printk("dev = (%d,%d), ino = %lu, %s%s, %s, index = %lu, blkaddr = 0x%llx",
-                show_dev_ino(__entry),
-                show_bio_type(__entry->rw),
-                show_block_type(__entry->type),
-                (unsigned long)__entry->index,
-                (unsigned long long)__entry->block)
-);
-
 TRACE_EVENT(f2fs_write_checkpoint,
 
         TP_PROTO(struct super_block *sb, int reason, char *msg),
@@ -998,14 +989,15 @@ TRACE_EVENT(f2fs_issue_discard,
 
 TRACE_EVENT(f2fs_issue_flush,
 
-        TP_PROTO(struct super_block *sb, bool nobarrier, bool flush_merge),
+        TP_PROTO(struct super_block *sb, unsigned int nobarrier,
+                                        unsigned int flush_merge),
 
         TP_ARGS(sb, nobarrier, flush_merge),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
-                __field(bool, nobarrier)
-                __field(bool, flush_merge)
+                __field(unsigned int, nobarrier)
+                __field(unsigned int, flush_merge)
         ),
 
         TP_fast_assign(