Subject: [PATCH] ext4: fix warning message to output correct type.

Output the warning message before we clobber type and be -1 all the time.
The error message would now be

[ 1.519791] EXT4-fs warning (device vdb): ext4_enable_quotas:5402:
Failed to enable quota tracking (type=0, err=-3). Please run e2fsck to fix.

Signed-off-by: Junichi Uekawa <[email protected]>
---
fs/ext4/super.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ba2396a7bd04..1b90f619663c 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5670,13 +5670,13 @@ static int ext4_enable_quotas(struct super_block *sb)
DQUOT_USAGE_ENABLED |
(quota_mopt[type] ? DQUOT_LIMITS_ENABLED : 0));
if (err) {
- for (type--; type >= 0; type--)
- dquot_quota_off(sb, type);
-
ext4_warning(sb,
"Failed to enable quota tracking "
"(type=%d, err=%d). Please run "
"e2fsck to fix.", type, err);
+ for (type--; type >= 0; type--)
+ dquot_quota_off(sb, type);
+
return err;
}
}
--
2.18.0.203.gfac676dfb9-goog



2018-07-22 22:25:12

by Theodore Ts'o

[permalink] [raw]
Subject: Re: [PATCH] ext4: fix warning message to output correct type.

On Fri, Jul 13, 2018 at 06:15:47PM +0900, Junichi Uekawa wrote:
> Output the warning message before we clobber type and be -1 all the time.
> The error message would now be
>
> [ 1.519791] EXT4-fs warning (device vdb): ext4_enable_quotas:5402:
> Failed to enable quota tracking (type=0, err=-3). Please run e2fsck to fix.
>
> Signed-off-by: Junichi Uekawa <[email protected]>

Thanks, applied.

- Ted