|
@@ -83,6 +83,7 @@ enum {
|
|
|
Opt_discard,
|
|
|
Opt_nodiscard,
|
|
|
Opt_noheap,
|
|
|
+ Opt_heap,
|
|
|
Opt_user_xattr,
|
|
|
Opt_nouser_xattr,
|
|
|
Opt_acl,
|
|
@@ -117,6 +118,7 @@ static match_table_t f2fs_tokens = {
|
|
|
{Opt_discard, "discard"},
|
|
|
{Opt_nodiscard, "nodiscard"},
|
|
|
{Opt_noheap, "no_heap"},
|
|
|
+ {Opt_heap, "heap"},
|
|
|
{Opt_user_xattr, "user_xattr"},
|
|
|
{Opt_nouser_xattr, "nouser_xattr"},
|
|
|
{Opt_acl, "acl"},
|
|
@@ -437,6 +439,9 @@ static int parse_options(struct super_block *sb, char *options)
|
|
|
case Opt_noheap:
|
|
|
set_opt(sbi, NOHEAP);
|
|
|
break;
|
|
|
+ case Opt_heap:
|
|
|
+ clear_opt(sbi, NOHEAP);
|
|
|
+ break;
|
|
|
#ifdef CONFIG_F2FS_FS_XATTR
|
|
|
case Opt_user_xattr:
|
|
|
set_opt(sbi, XATTR_USER);
|
|
@@ -914,7 +919,9 @@ static int f2fs_show_options(struct seq_file *seq, struct dentry *root)
|
|
|
if (test_opt(sbi, DISCARD))
|
|
|
seq_puts(seq, ",discard");
|
|
|
if (test_opt(sbi, NOHEAP))
|
|
|
- seq_puts(seq, ",no_heap_alloc");
|
|
|
+ seq_puts(seq, ",no_heap");
|
|
|
+ else
|
|
|
+ seq_puts(seq, ",heap");
|
|
|
#ifdef CONFIG_F2FS_FS_XATTR
|
|
|
if (test_opt(sbi, XATTR_USER))
|
|
|
seq_puts(seq, ",user_xattr");
|
|
@@ -1047,6 +1054,7 @@ static void default_options(struct f2fs_sb_info *sbi)
|
|
|
set_opt(sbi, INLINE_DATA);
|
|
|
set_opt(sbi, INLINE_DENTRY);
|
|
|
set_opt(sbi, EXTENT_CACHE);
|
|
|
+ set_opt(sbi, NOHEAP);
|
|
|
sbi->sb->s_flags |= MS_LAZYTIME;
|
|
|
set_opt(sbi, FLUSH_MERGE);
|
|
|
if (f2fs_sb_mounted_blkzoned(sbi->sb)) {
|