|
@@ -1155,9 +1155,9 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
|
|
|
seq_puts(seq, ",block_validity");
|
|
|
|
|
|
if (!test_opt(sb, INIT_INODE_TABLE))
|
|
|
- seq_puts(seq, ",noinit_inode_table");
|
|
|
+ seq_puts(seq, ",noinit_itable");
|
|
|
else if (sbi->s_li_wait_mult != EXT4_DEF_LI_WAIT_MULT)
|
|
|
- seq_printf(seq, ",init_inode_table=%u",
|
|
|
+ seq_printf(seq, ",init_itable=%u",
|
|
|
(unsigned) sbi->s_li_wait_mult);
|
|
|
|
|
|
ext4_show_quota_options(seq, sb);
|
|
@@ -1333,8 +1333,7 @@ enum {
|
|
|
Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
|
|
|
Opt_inode_readahead_blks, Opt_journal_ioprio,
|
|
|
Opt_dioread_nolock, Opt_dioread_lock,
|
|
|
- Opt_discard, Opt_nodiscard,
|
|
|
- Opt_init_inode_table, Opt_noinit_inode_table,
|
|
|
+ Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
|
|
|
};
|
|
|
|
|
|
static const match_table_t tokens = {
|
|
@@ -1407,9 +1406,9 @@ static const match_table_t tokens = {
|
|
|
{Opt_dioread_lock, "dioread_lock"},
|
|
|
{Opt_discard, "discard"},
|
|
|
{Opt_nodiscard, "nodiscard"},
|
|
|
- {Opt_init_inode_table, "init_itable=%u"},
|
|
|
- {Opt_init_inode_table, "init_itable"},
|
|
|
- {Opt_noinit_inode_table, "noinit_itable"},
|
|
|
+ {Opt_init_itable, "init_itable=%u"},
|
|
|
+ {Opt_init_itable, "init_itable"},
|
|
|
+ {Opt_noinit_itable, "noinit_itable"},
|
|
|
{Opt_err, NULL},
|
|
|
};
|
|
|
|
|
@@ -1892,7 +1891,7 @@ set_qf_format:
|
|
|
case Opt_dioread_lock:
|
|
|
clear_opt(sb, DIOREAD_NOLOCK);
|
|
|
break;
|
|
|
- case Opt_init_inode_table:
|
|
|
+ case Opt_init_itable:
|
|
|
set_opt(sb, INIT_INODE_TABLE);
|
|
|
if (args[0].from) {
|
|
|
if (match_int(&args[0], &option))
|
|
@@ -1903,7 +1902,7 @@ set_qf_format:
|
|
|
return 0;
|
|
|
sbi->s_li_wait_mult = option;
|
|
|
break;
|
|
|
- case Opt_noinit_inode_table:
|
|
|
+ case Opt_noinit_itable:
|
|
|
clear_opt(sb, INIT_INODE_TABLE);
|
|
|
break;
|
|
|
default:
|