[PATCH] ext4: remove an unused variable warning with CONFIG_QUOTA=n

[PATCH] ext4: remove an unused variable warning with CONFIG_QUOTA=n

[Austin Kim]

The 'enable_quota' variable is only used in an CONFIG_QUOTA.
With CONFIG_QUOTA=n, compiler causes a harmless warning:

fs/ext4/super.c: In function ‘ext4_remount’:
fs/ext4/super.c:5840:6: warning: variable ‘enable_quota’ set but not used
  [-Wunused-but-set-variable]
  int enable_quota = 0;
              ^~~~~

Move 'enable_quota' into the same #ifdef CONFIG_QUOTA block
to remove an unused variable warning.

Signed-off-by: Austin Kim <austindh.kim@gmail.com>
---
 fs/ext4/super.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6b03e4281f6f..6adb570f4b31 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5845,10 +5845,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 	struct ext4_sb_info *sbi = EXT4_SB(sb);
 	unsigned long old_sb_flags, vfs_flags;
 	struct ext4_mount_options old_opts;
-	int enable_quota = 0;
 	ext4_group_t g;
 	int err = 0;
 #ifdef CONFIG_QUOTA
+	int enable_quota = 0;
 	int i, j;
 	char *to_free[EXT4_MAXQUOTAS];
 #endif
@@ -6053,7 +6053,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
 					err = -EROFS;
 					goto restore_opts;
 				}
+#ifdef CONFIG_QUOTA
 			enable_quota = 1;
+#endif
 		}
 	}
 
-- 
2.20.1

Re: [PATCH] ext4: remove an unused variable warning with CONFIG_QUOTA=n

[Austin Kim]

2021년 8월 24일 (화) 오후 12:49, Austin Kim <austindh.kim@gmail.com>님이 작성:
>
> The 'enable_quota' variable is only used in an CONFIG_QUOTA.
> With CONFIG_QUOTA=n, compiler causes a harmless warning:
>
> fs/ext4/super.c: In function ‘ext4_remount’:
> fs/ext4/super.c:5840:6: warning: variable ‘enable_quota’ set but not used
>   [-Wunused-but-set-variable]
>   int enable_quota = 0;
>               ^~~~~
>
> Move 'enable_quota' into the same #ifdef CONFIG_QUOTA block
> to remove an unused variable warning.
>
> Signed-off-by: Austin Kim <austindh.kim@gmail.com>
> ---
>  fs/ext4/super.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 6b03e4281f6f..6adb570f4b31 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5845,10 +5845,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
>         struct ext4_sb_info *sbi = EXT4_SB(sb);
>         unsigned long old_sb_flags, vfs_flags;
>         struct ext4_mount_options old_opts;
> -       int enable_quota = 0;
>         ext4_group_t g;
>         int err = 0;
>  #ifdef CONFIG_QUOTA
> +       int enable_quota = 0;
>         int i, j;
>         char *to_free[EXT4_MAXQUOTAS];
>  #endif
> @@ -6053,7 +6053,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
>                                         err = -EROFS;
>                                         goto restore_opts;
>                                 }
> +#ifdef CONFIG_QUOTA
>                         enable_quota = 1;
> +#endif
>                 }
>         }
>
> --
> 2.20.1
>

If you are available, would you please review this patch?
It will not take long.

BR,
Austin Kim

Re: [PATCH] ext4: remove an unused variable warning with CONFIG_QUOTA=n

[Jan Kara]

On Tue 24-08-21 04:49:29, Austin Kim wrote:
> The 'enable_quota' variable is only used in an CONFIG_QUOTA.
> With CONFIG_QUOTA=n, compiler causes a harmless warning:
> 
> fs/ext4/super.c: In function ‘ext4_remount’:
> fs/ext4/super.c:5840:6: warning: variable ‘enable_quota’ set but not used
>   [-Wunused-but-set-variable]
>   int enable_quota = 0;
>               ^~~~~
> 
> Move 'enable_quota' into the same #ifdef CONFIG_QUOTA block
> to remove an unused variable warning.
> 
> Signed-off-by: Austin Kim <austindh.kim@gmail.com>

I guess this has fallen through the cracks. The fix looks good to me. Feel
free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/ext4/super.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 6b03e4281f6f..6adb570f4b31 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5845,10 +5845,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
>  	struct ext4_sb_info *sbi = EXT4_SB(sb);
>  	unsigned long old_sb_flags, vfs_flags;
>  	struct ext4_mount_options old_opts;
> -	int enable_quota = 0;
>  	ext4_group_t g;
>  	int err = 0;
>  #ifdef CONFIG_QUOTA
> +	int enable_quota = 0;
>  	int i, j;
>  	char *to_free[EXT4_MAXQUOTAS];
>  #endif
> @@ -6053,7 +6053,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
>  					err = -EROFS;
>  					goto restore_opts;
>  				}
> +#ifdef CONFIG_QUOTA
>  			enable_quota = 1;
> +#endif
>  		}
>  	}
>  
> -- 
> 2.20.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Re: [PATCH] ext4: remove an unused variable warning with CONFIG_QUOTA=n

[Theodore Ts'o]

On Tue, 24 Aug 2021 04:49:29 +0100, Austin Kim wrote:
> The 'enable_quota' variable is only used in an CONFIG_QUOTA.
> With CONFIG_QUOTA=n, compiler causes a harmless warning:
> 
> fs/ext4/super.c: In function ‘ext4_remount’:
> fs/ext4/super.c:5840:6: warning: variable ‘enable_quota’ set but not used
>   [-Wunused-but-set-variable]
>   int enable_quota = 0;
>               ^~~~~
> 
> [...]

Applied, thanks!

[1/1] ext4: remove an unused variable warning with CONFIG_QUOTA=n
      commit: d94ca0e1d65f4c274e3425a35f23ffe58ecea18a

Best regards,
-- 
Theodore Ts'o <tytso@mit.edu>