1 files changed, 32 insertions, 8 deletions

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index f2fe666a6ea9..160b88346b24 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -57,6 +57,8 @@ enum {
         Opt_flush_merge,
         Opt_nobarrier,
         Opt_fastboot,
+        Opt_extent_cache,
+        Opt_noinline_data,
         Opt_err,
 };
 
@@ -78,6 +80,8 @@ static match_table_t f2fs_tokens = {
         {Opt_flush_merge, "flush_merge"},
         {Opt_nobarrier, "nobarrier"},
         {Opt_fastboot, "fastboot"},
+        {Opt_extent_cache, "extent_cache"},
+        {Opt_noinline_data, "noinline_data"},
         {Opt_err, NULL},
 };
 
@@ -367,6 +371,12 @@ static int parse_options(struct super_block *sb, char *options)
                 case Opt_fastboot:
                         set_opt(sbi, FASTBOOT);
                         break;
+                case Opt_extent_cache:
+                        set_opt(sbi, EXTENT_CACHE);
+                        break;
+                case Opt_noinline_data:
+                        clear_opt(sbi, INLINE_DATA);
+                        break;
                 default:
                         f2fs_msg(sb, KERN_ERR,
                                 "Unrecognized mount option \"%s\" or missing value",
@@ -392,7 +402,7 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
         atomic_set(&fi->dirty_pages, 0);
         fi->i_current_depth = 1;
         fi->i_advise = 0;
-        rwlock_init(&fi->ext.ext_lock);
+        rwlock_init(&fi->ext_lock);
         init_rwsem(&fi->i_sem);
         INIT_RADIX_TREE(&fi->inmem_root, GFP_NOFS);
         INIT_LIST_HEAD(&fi->inmem_pages);
@@ -591,6 +601,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
                 seq_puts(seq, ",disable_ext_identify");
         if (test_opt(sbi, INLINE_DATA))
                 seq_puts(seq, ",inline_data");
+        else
+                seq_puts(seq, ",noinline_data");
         if (test_opt(sbi, INLINE_DENTRY))
                 seq_puts(seq, ",inline_dentry");
         if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))
@@ -599,6 +611,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
                 seq_puts(seq, ",nobarrier");
         if (test_opt(sbi, FASTBOOT))
                 seq_puts(seq, ",fastboot");
+        if (test_opt(sbi, EXTENT_CACHE))
+                seq_puts(seq, ",extent_cache");
         seq_printf(seq, ",active_logs=%u", sbi->active_logs);
 
         return 0;
@@ -959,7 +973,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
         struct buffer_head *raw_super_buf;
         struct inode *root;
         long err = -EINVAL;
-        bool retry = true;
+        bool retry = true, need_fsck = false;
         char *options = NULL;
         int i;
 
@@ -984,6 +998,7 @@ try_onemore:
         sbi->active_logs = NR_CURSEG_TYPE;
 
         set_opt(sbi, BG_GC);
+        set_opt(sbi, INLINE_DATA);
 
 #ifdef CONFIG_F2FS_FS_XATTR
         set_opt(sbi, XATTR_USER);
@@ -1020,7 +1035,6 @@ try_onemore:
         sbi->raw_super = raw_super;
         sbi->raw_super_buf = raw_super_buf;
         mutex_init(&sbi->gc_mutex);
-        mutex_init(&sbi->writepages);
         mutex_init(&sbi->cp_mutex);
         init_rwsem(&sbi->node_write);
         clear_sbi_flag(sbi, SBI_POR_DOING);
@@ -1072,6 +1086,8 @@ try_onemore:
         INIT_LIST_HEAD(&sbi->dir_inode_list);
         spin_lock_init(&sbi->dir_inode_lock);
 
+        init_extent_cache_info(sbi);
+
         init_ino_entry_info(sbi);
 
         /* setup f2fs internal modules */
@@ -1146,9 +1162,6 @@ try_onemore:
         if (err)
                 goto free_proc;
 
-        if (!retry)
-                set_sbi_flag(sbi, SBI_NEED_FSCK);
-
         /* recover fsynced data */
         if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {
                 /*
@@ -1160,8 +1173,13 @@ try_onemore:
                         err = -EROFS;
                         goto free_kobj;
                 }
+
+                if (need_fsck)
+                        set_sbi_flag(sbi, SBI_NEED_FSCK);
+
                 err = recover_fsync_data(sbi);
                 if (err) {
+                        need_fsck = true;
                         f2fs_msg(sb, KERN_ERR,
                                 "Cannot recover all fsync data errno=%ld", err);
                         goto free_kobj;
@@ -1212,7 +1230,7 @@ free_sbi:
 
         /* give only one another chance */
         if (retry) {
-                retry = 0;
+                retry = false;
                 shrink_dcache_sb(sb);
                 goto try_onemore;
         }
@@ -1278,10 +1296,13 @@ static int __init init_f2fs_fs(void)
         err = create_checkpoint_caches();
         if (err)
                 goto free_segment_manager_caches;
+        err = create_extent_cache();
+        if (err)
+                goto free_checkpoint_caches;
         f2fs_kset = kset_create_and_add("f2fs", NULL, fs_kobj);
         if (!f2fs_kset) {
                 err = -ENOMEM;
-                goto free_checkpoint_caches;
+                goto free_extent_cache;
         }
         err = register_filesystem(&f2fs_fs_type);
         if (err)
@@ -1292,6 +1313,8 @@ static int __init init_f2fs_fs(void)
 
 free_kset:
         kset_unregister(f2fs_kset);
+free_extent_cache:
+        destroy_extent_cache();
 free_checkpoint_caches:
         destroy_checkpoint_caches();
 free_segment_manager_caches:
@@ -1309,6 +1332,7 @@ static void __exit exit_f2fs_fs(void)
         remove_proc_entry("fs/f2fs", NULL);
         f2fs_destroy_root_stats();
         unregister_filesystem(&f2fs_fs_type);
+        destroy_extent_cache();
         destroy_checkpoint_caches();
         destroy_segment_manager_caches();
         destroy_node_manager_caches();