From: Tyson Nottingham <tgnottingham@gmail.com>
Date: Fri, 30 Mar 2018 04:53:33 +0000 (-0400)
Subject: ext4: omit init_itable=n in procfs when disabled
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ceec03764a3921d03aefe4cc9b3b14cf8527ceff;p=openwrt%2Fstaging%2Fblogic.git

ext4: omit init_itable=n in procfs when disabled

Don't show init_itable=n in /proc/fs/ext4/<dev>/options when filesystem
is mounted with noinit_itable.

Signed-off-by: Tyson Nottingham <tgnottingham@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2376ac09e013..20d5233856c5 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2084,7 +2084,7 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
 		SEQ_OPTS_PRINT("inode_readahead_blks=%u",
 			       sbi->s_inode_readahead_blks);
 
-	if (nodefs || (test_opt(sb, INIT_INODE_TABLE) &&
+	if (test_opt(sb, INIT_INODE_TABLE) && (nodefs ||
 		       (sbi->s_li_wait_mult != EXT4_DEF_LI_WAIT_MULT)))
 		SEQ_OPTS_PRINT("init_itable=%u", sbi->s_li_wait_mult);
 	if (nodefs || sbi->s_max_dir_size_kb)