ext4: avoid unused-variable warning with CONFIG_QUOTA=n
PATCH 1/1 ext4: avoid unused-variable warning with CONFIG_QUOTA=n
From: Arnd Bergmann <[email protected]>
After some code reshuffling, the index variables in two functions are only used in an #ifdef:
fs/ext4/super.c: In function 'ext4_put_super':fs/ext4/super.c:1262:13: error: unused variable 'i' [-Werror=unused-variable] fs/ext4/super.c: In function '__ext4_fill_super':fs/ext4/super.c:5200:22: error: unused variable 'i' [-Werror=unused-variable]
Since all supported compilers now allow having variable declarations inside of a for() loop, move them into the #ifdef block directly.
--- fs/ext4/super.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/ext4/super.c +3 -4
@@ -1259,7 +1259,7 @@ static void ext4_put_super(struct super_block *sb)struct ext4_sb_info *sbi =EXT4_SB (sb);struct ext4_super_block *es = sbi->s_es;int aborted =0 ; -int i, err; +int err;/* * Unregister sysfs before destroying jbd2 journal.
@@ -1311,7 +1311,7 @@ static void ext4_put_super(struct super_block *sb)ext4_flex_groups_free (sbi);ext4_percpu_param_destroy (sbi);#ifdef CONFIG_QUOTA -for (i =0 ; i <EXT4_MAXQUOTAS ; i++) +for (int i =0 ; i <EXT4_MAXQUOTAS ; i++)kfree (get_qf_name (sb, sbi, i));#endif
@@ -5197,7 +5197,6 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)ext4_fsblk_t logical_sb_block;struct inode *root;int ret = -ENOMEM ; -unsigned int i;int needs_recovery;int err =0 ;ext4_group_t first_not_zeroed;
@@ -5628,7 +5627,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)#endif #ifdef CONFIG_QUOTA -for (i =0 ; i <EXT4_MAXQUOTAS ; i++) +for (int i =0 ; i <EXT4_MAXQUOTAS ; i++)kfree (get_qf_name (sb, sbi, i));#endif fscrypt_free_dummy_policy (&sbi->s_dummy_enc_policy);
Signature · 1 line
2.39.2
Hi Arnd,
Quoted 10 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
After some code reshuffling, the index variables in two functions are only used in an #ifdef:
fs/ext4/super.c: In function 'ext4_put_super':fs/ext4/super.c:1262:13: error: unused variable 'i' [-Werror=unused-variable]fs/ext4/super.c: In function '__ext4_fill_super':fs/ext4/super.c:5200:22: error: unused variable 'i' [-Werror=unused-variable]
Quoted 8 lines
Since all supported compilers now allow having variable declarations inside of a
for()loop, move them into the #ifdef block directly.Fixes dcbf87589d90 ("ext4: factor out ext4_flex_groups_free()")Signed-off-by Arnd Bergmann <[email protected]>--- fs/ext4/super.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Thanks for the patch. But Nathan has already sent a patch to fix this.
Jason