Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c1794a authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: enable inline_dentry by default and add noinline_dentry option 



Make inline_dentry as default mount option to improve space usage and
IO performance in scenario of numerous small directory.
It adds noinline_dentry mount option, instead.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 5d2b42ed

Documentation/filesystems/f2fs.txt

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ inline_dentry Enable the inline dir feature: data in new created 
                       directory entries can be written into inode block. The

                       space of inode block which is used to store inline

                       dentries is limited to ~3.4k.

noinline_dentry        Diable the inline dentry feature.

flush_merge	       Merge concurrent cache_flush commands as much as possible

                       to eliminate redundant command issues. If the underlying

		       device handles the cache_flush command relatively slowly,

fs/f2fs/super.c

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ enum { 
	Opt_inline_xattr,

	Opt_inline_data,

	Opt_inline_dentry,

	Opt_noinline_dentry,

	Opt_flush_merge,

	Opt_noflush_merge,

	Opt_nobarrier,
@@ -118,6 +119,7 @@ static match_table_t f2fs_tokens = { 
	{Opt_inline_xattr, "inline_xattr"},

	{Opt_inline_data, "inline_data"},

	{Opt_inline_dentry, "inline_dentry"},

	{Opt_noinline_dentry, "noinline_dentry"},

	{Opt_flush_merge, "flush_merge"},

	{Opt_noflush_merge, "noflush_merge"},

	{Opt_nobarrier, "nobarrier"},
@@ -488,6 +490,9 @@ static int parse_options(struct super_block *sb, char *options) 
		case Opt_inline_dentry:

			set_opt(sbi, INLINE_DENTRY);

			break;

		case Opt_noinline_dentry:

			clear_opt(sbi, INLINE_DENTRY);

			break;

		case Opt_flush_merge:

			set_opt(sbi, FLUSH_MERGE);

			break;
@@ -878,6 +883,8 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root) 
		seq_puts(seq, ",noinline_data");

	if (test_opt(sbi, INLINE_DENTRY))

		seq_puts(seq, ",inline_dentry");

	else

		seq_puts(seq, ",noinline_dentry");

	if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE))

		seq_puts(seq, ",flush_merge");

	if (test_opt(sbi, NOBARRIER))
@@ -975,6 +982,7 @@ static void default_options(struct f2fs_sb_info *sbi) 


	set_opt(sbi, BG_GC);

	set_opt(sbi, INLINE_DATA);

	set_opt(sbi, INLINE_DENTRY);

	set_opt(sbi, EXTENT_CACHE);

	sbi->sb->s_flags |= MS_LAZYTIME;

	set_opt(sbi, FLUSH_MERGE);