Skip to content

Commit

Permalink
f2fs: enable inline data by default
Browse files Browse the repository at this point in the history
Enable inline_data feature by default since it brings us better
performance and space utilization and now has already stable.
Add another option noinline_data to disable it during mount.

Suggested-by: Jaegeuk Kim <jaegeuk@kernel.org>
Suggested-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Wanpeng Li authored and Jaegeuk Kim committed Apr 10, 2015
1 parent 0bdee48 commit 7534279
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Documentation/filesystems/f2fs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ extent_cache Enable an extent cache based on rb-tree, it can cache
as many as extent which map between contiguous logical
address and physical address per inode, resulting in
increasing the cache hit ratio.
noinline_data Disable the inline data feature, inline data feature is
enabled by default.

================================================================================
DEBUGFS ENTRIES
Expand Down
8 changes: 8 additions & 0 deletions fs/f2fs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ enum {
Opt_nobarrier,
Opt_fastboot,
Opt_extent_cache,
Opt_noinline_data,
Opt_err,
};

Expand All @@ -80,6 +81,7 @@ static match_table_t f2fs_tokens = {
{Opt_nobarrier, "nobarrier"},
{Opt_fastboot, "fastboot"},
{Opt_extent_cache, "extent_cache"},
{Opt_noinline_data, "noinline_data"},
{Opt_err, NULL},
};

Expand Down Expand Up @@ -372,6 +374,9 @@ static int parse_options(struct super_block *sb, char *options)
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",
Expand Down Expand Up @@ -596,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))
Expand Down Expand Up @@ -991,6 +998,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
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);
Expand Down

0 comments on commit 7534279

Please sign in to comment.