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

Pull f2fs updates from Jaegeuk Kim:
 "In this round, a couple of sysfs entries were introduced to tune the
  f2fs at runtime.

  In addition, f2fs starts to support inline_data and improves the
  read/write performance in some workloads by refactoring bio-related
  flows.

  This patch-set includes the following major enhancement patches.
   - support inline_data
   - refactor bio operations such as merge operations and rw type
     assignment
   - enhance the direct IO path
   - enhance bio operations
   - truncate a node page when it becomes obsolete
   - add sysfs entries: small_discards, max_victim_search, and
     in-place-update
   - add a sysfs entry to control max_victim_search

  The other bug fixes are as follows.
   - fix a bug in truncate_partial_nodes
   - avoid warnings during sparse and build process
   - fix error handling flows
   - fix potential bit overflows

  And, there are a bunch of cleanups"

* tag 'for-f2fs-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (95 commits)
  f2fs: drop obsolete node page when it is truncated
  f2fs: introduce NODE_MAPPING for code consistency
  f2fs: remove the orphan block page array
  f2fs: add help function META_MAPPING
  f2fs: move a branch for code redability
  f2fs: call mark_inode_dirty to flush dirty pages
  f2fs: clean checkpatch warnings
  f2fs: missing REQ_META and REQ_PRIO when sync_meta_pages(META_FLUSH)
  f2fs: avoid f2fs_balance_fs call during pageout
  f2fs: add delimiter to seperate name and value in debug phrase
  f2fs: use spinlock rather than mutex for better speed
  f2fs: move alloc new orphan node out of lock protection region
  f2fs: move grabing orphan pages out of protection region
  f2fs: remove the needless parameter of f2fs_wait_on_page_writeback
  f2fs: update documents and a MAINTAINERS entry
  f2fs: add a sysfs entry to control max_victim_search
  f2fs: improve write performance under frequent fsync calls
  f2fs: avoid to read inline data except first page
  f2fs: avoid to left uninitialized data in page when read inline data
  f2fs: fix truncate_partial_nodes bug
  ...

1 files changed, 37 insertions, 16 deletions

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index a84b0a8e6854..3de9d20d0c14 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -24,7 +24,7 @@
 #include "gc.h"
 
 static LIST_HEAD(f2fs_stat_list);
-static struct dentry *debugfs_root;
+static struct dentry *f2fs_debugfs_root;
 static DEFINE_MUTEX(f2fs_stat_mutex);
 
 static void update_general_status(struct f2fs_sb_info *sbi)
@@ -45,14 +45,15 @@ static void update_general_status(struct f2fs_sb_info *sbi)
         si->valid_count = valid_user_blocks(sbi);
         si->valid_node_count = valid_node_count(sbi);
         si->valid_inode_count = valid_inode_count(sbi);
+        si->inline_inode = sbi->inline_inode;
         si->utilization = utilization(sbi);
 
         si->free_segs = free_segments(sbi);
         si->free_secs = free_sections(sbi);
         si->prefree_count = prefree_segments(sbi);
         si->dirty_count = dirty_segments(sbi);
-        si->node_pages = sbi->node_inode->i_mapping->nrpages;
-        si->meta_pages = sbi->meta_inode->i_mapping->nrpages;
+        si->node_pages = NODE_MAPPING(sbi)->nrpages;
+        si->meta_pages = META_MAPPING(sbi)->nrpages;
         si->nats = NM_I(sbi)->nat_cnt;
         si->sits = SIT_I(sbi)->dirty_sentries;
         si->fnids = NM_I(sbi)->fcnt;
@@ -165,9 +166,9 @@ get_cache:
         /* free nids */
         si->cache_mem = NM_I(sbi)->fcnt;
         si->cache_mem += NM_I(sbi)->nat_cnt;
-        npages = sbi->node_inode->i_mapping->nrpages;
+        npages = NODE_MAPPING(sbi)->nrpages;
         si->cache_mem += npages << PAGE_CACHE_SHIFT;
-        npages = sbi->meta_inode->i_mapping->nrpages;
+        npages = META_MAPPING(sbi)->nrpages;
         si->cache_mem += npages << PAGE_CACHE_SHIFT;
         si->cache_mem += sbi->n_orphans * sizeof(struct orphan_inode_entry);
         si->cache_mem += sbi->n_dirty_dirs * sizeof(struct dir_inode_entry);
@@ -200,6 +201,8 @@ static int stat_show(struct seq_file *s, void *v)
                 seq_printf(s, "Other: %u)\n  - Data: %u\n",
                            si->valid_node_count - si->valid_inode_count,
                            si->valid_count - si->valid_node_count);
+                seq_printf(s, "  - Inline_data Inode: %u\n",
+                           si->inline_inode);
                 seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",
                            si->main_area_segs, si->main_area_sections,
                            si->main_area_zones);
@@ -242,14 +245,14 @@ static int stat_show(struct seq_file *s, void *v)
                 seq_printf(s, "  - node blocks : %d\n", si->node_blks);
                 seq_printf(s, "\nExtent Hit Ratio: %d / %d\n",
                            si->hit_ext, si->total_ext);
-                seq_printf(s, "\nBalancing F2FS Async:\n");
-                seq_printf(s, "  - nodes %4d in %4d\n",
+                seq_puts(s, "\nBalancing F2FS Async:\n");
+                seq_printf(s, "  - nodes: %4d in %4d\n",
                            si->ndirty_node, si->node_pages);
-                seq_printf(s, "  - dents %4d in dirs:%4d\n",
+                seq_printf(s, "  - dents: %4d in dirs:%4d\n",
                            si->ndirty_dent, si->ndirty_dirs);
-                seq_printf(s, "  - meta %4d in %4d\n",
+                seq_printf(s, "  - meta: %4d in %4d\n",
                            si->ndirty_meta, si->meta_pages);
-                seq_printf(s, "  - NATs %5d > %lu\n",
+                seq_printf(s, "  - NATs: %5d > %lu\n",
                            si->nats, NM_WOUT_THRESHOLD);
                 seq_printf(s, "  - SITs: %5d\n  - free_nids: %5d\n",
                            si->sits, si->fnids);
@@ -340,14 +343,32 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi)
 
 void __init f2fs_create_root_stats(void)
 {
-        debugfs_root = debugfs_create_dir("f2fs", NULL);
-        if (debugfs_root)
-                debugfs_create_file("status", S_IRUGO, debugfs_root,
-                                         NULL, &stat_fops);
+        struct dentry *file;
+
+        f2fs_debugfs_root = debugfs_create_dir("f2fs", NULL);
+        if (!f2fs_debugfs_root)
+                goto bail;
+
+        file = debugfs_create_file("status", S_IRUGO, f2fs_debugfs_root,
+                        NULL, &stat_fops);
+        if (!file)
+                goto free_debugfs_dir;
+
+        return;
+
+free_debugfs_dir:
+        debugfs_remove(f2fs_debugfs_root);
+
+bail:
+        f2fs_debugfs_root = NULL;
+        return;
 }
 
 void f2fs_destroy_root_stats(void)
 {
-        debugfs_remove_recursive(debugfs_root);
-        debugfs_root = NULL;
+        if (!f2fs_debugfs_root)
+                return;
+
+        debugfs_remove_recursive(f2fs_debugfs_root);
+        f2fs_debugfs_root = NULL;
 }