* [PATCH 1/2] f2fs: report error if quota off error during umount
@ 2018-09-06 12:44 Chao Yu
2018-09-06 12:44 ` [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super Chao Yu
0 siblings, 1 reply; 4+ messages in thread
From: Chao Yu @ 2018-09-06 12:44 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao, Yunlei He, Chao Yu
From: Yunlei He <heyunlei@huawei.com>
Now, we depend on fsck to ensure quota file data is ok,
so we scan whole partition if checkpoint without umount
flag. It's same for quota off error case, which may make
quota file data inconsistent.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Yunlei He <heyunlei@huawei.com>
---
fs/f2fs/super.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 8f026ba226fb..c026aaccf218 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1874,7 +1874,9 @@ static int f2fs_quota_off(struct super_block *sb, int type)
if (!inode || !igrab(inode))
return dquot_quota_off(sb, type);
- f2fs_quota_sync(sb, type);
+ err = f2fs_quota_sync(sb, type);
+ if (err)
+ goto out_put;
err = dquot_quota_off(sb, type);
if (err || f2fs_sb_has_quota_ino(sb))
@@ -1893,9 +1895,18 @@ static int f2fs_quota_off(struct super_block *sb, int type)
void f2fs_quota_off_umount(struct super_block *sb)
{
int type;
+ int err;
- for (type = 0; type < MAXQUOTAS; type++)
- f2fs_quota_off(sb, type);
+ for (type = 0; type < MAXQUOTAS; type++) {
+ err = f2fs_quota_off(sb, type);
+ if (err) {
+ f2fs_msg(sb, KERN_ERR,
+ "Fail to turn off disk quota "
+ "(type: %d, err: %d), Please "
+ "run fsck to fix it.", type, err);
+ set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
+ }
+ }
}
static int f2fs_dquot_commit(struct dquot *dquot)
--
2.18.0.rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super
2018-09-06 12:44 [PATCH 1/2] f2fs: report error if quota off error during umount Chao Yu
@ 2018-09-06 12:44 ` Chao Yu
2018-09-07 22:38 ` Jaegeuk Kim
0 siblings, 1 reply; 4+ messages in thread
From: Chao Yu @ 2018-09-06 12:44 UTC (permalink / raw)
To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao, Chao Yu
generic/019 reports below error:
__quota_error: 1160 callbacks suppressed
Quota error (device zram1): write_blk: dquota write failed
Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
Quota error (device zram1): write_blk: dquota write failed
Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
Quota error (device zram1): write_blk: dquota write failed
Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
Quota error (device zram1): write_blk: dquota write failed
Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
Quota error (device zram1): write_blk: dquota write failed
Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
VFS: Busy inodes after unmount of zram1. Self-destruct in 5 seconds. Have a nice day...
If we failed in below path due to fail to write dquot block, we will miss
to release quota inode, fix it.
- f2fs_put_super
- f2fs_quota_off_umount
- f2fs_quota_off
- f2fs_quota_sync <-- failed
- dquot_quota_off <-- missed to call
Signed-off-by: Chao Yu <yuchao0@huawei.com>
---
fs/f2fs/super.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index c026aaccf218..328f58647f4c 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1900,10 +1900,12 @@ void f2fs_quota_off_umount(struct super_block *sb)
for (type = 0; type < MAXQUOTAS; type++) {
err = f2fs_quota_off(sb, type);
if (err) {
+ int ret = dquot_quota_off(sb, type);
+
f2fs_msg(sb, KERN_ERR,
"Fail to turn off disk quota "
- "(type: %d, err: %d), Please "
- "run fsck to fix it.", type, err);
+ "(type: %d, err: %d, ret:%d), Please "
+ "run fsck to fix it.", type, err, ret);
set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
}
}
--
2.18.0.rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super
2018-09-06 12:44 ` [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super Chao Yu
@ 2018-09-07 22:38 ` Jaegeuk Kim
2018-09-07 22:53 ` Chao Yu
0 siblings, 1 reply; 4+ messages in thread
From: Jaegeuk Kim @ 2018-09-07 22:38 UTC (permalink / raw)
To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel, chao
I merged as one. Please check dev. :)
On 09/06, Chao Yu wrote:
> generic/019 reports below error:
>
> __quota_error: 1160 callbacks suppressed
> Quota error (device zram1): write_blk: dquota write failed
> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
> Quota error (device zram1): write_blk: dquota write failed
> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
> Quota error (device zram1): write_blk: dquota write failed
> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
> Quota error (device zram1): write_blk: dquota write failed
> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
> Quota error (device zram1): write_blk: dquota write failed
> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
> VFS: Busy inodes after unmount of zram1. Self-destruct in 5 seconds. Have a nice day...
>
> If we failed in below path due to fail to write dquot block, we will miss
> to release quota inode, fix it.
>
> - f2fs_put_super
> - f2fs_quota_off_umount
> - f2fs_quota_off
> - f2fs_quota_sync <-- failed
> - dquot_quota_off <-- missed to call
>
> Signed-off-by: Chao Yu <yuchao0@huawei.com>
> ---
> fs/f2fs/super.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index c026aaccf218..328f58647f4c 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -1900,10 +1900,12 @@ void f2fs_quota_off_umount(struct super_block *sb)
> for (type = 0; type < MAXQUOTAS; type++) {
> err = f2fs_quota_off(sb, type);
> if (err) {
> + int ret = dquot_quota_off(sb, type);
> +
> f2fs_msg(sb, KERN_ERR,
> "Fail to turn off disk quota "
> - "(type: %d, err: %d), Please "
> - "run fsck to fix it.", type, err);
> + "(type: %d, err: %d, ret:%d), Please "
> + "run fsck to fix it.", type, err, ret);
> set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
> }
> }
> --
> 2.18.0.rc1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super
2018-09-07 22:38 ` Jaegeuk Kim
@ 2018-09-07 22:53 ` Chao Yu
0 siblings, 0 replies; 4+ messages in thread
From: Chao Yu @ 2018-09-07 22:53 UTC (permalink / raw)
To: Jaegeuk Kim, Chao Yu; +Cc: linux-f2fs-devel, linux-kernel
I can see it in dev, thanks for merging. ;)
On 2018/9/8 6:38, Jaegeuk Kim wrote:
> I merged as one. Please check dev. :)
>
> On 09/06, Chao Yu wrote:
>> generic/019 reports below error:
>>
>> __quota_error: 1160 callbacks suppressed
>> Quota error (device zram1): write_blk: dquota write failed
>> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
>> Quota error (device zram1): write_blk: dquota write failed
>> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
>> Quota error (device zram1): write_blk: dquota write failed
>> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
>> Quota error (device zram1): write_blk: dquota write failed
>> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
>> Quota error (device zram1): write_blk: dquota write failed
>> Quota error (device zram1): qtree_write_dquot: Error -28 occurred while creating quota
>> VFS: Busy inodes after unmount of zram1. Self-destruct in 5 seconds. Have a nice day...
>>
>> If we failed in below path due to fail to write dquot block, we will miss
>> to release quota inode, fix it.
>>
>> - f2fs_put_super
>> - f2fs_quota_off_umount
>> - f2fs_quota_off
>> - f2fs_quota_sync <-- failed
>> - dquot_quota_off <-- missed to call
>>
>> Signed-off-by: Chao Yu <yuchao0@huawei.com>
>> ---
>> fs/f2fs/super.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index c026aaccf218..328f58647f4c 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -1900,10 +1900,12 @@ void f2fs_quota_off_umount(struct super_block *sb)
>> for (type = 0; type < MAXQUOTAS; type++) {
>> err = f2fs_quota_off(sb, type);
>> if (err) {
>> + int ret = dquot_quota_off(sb, type);
>> +
>> f2fs_msg(sb, KERN_ERR,
>> "Fail to turn off disk quota "
>> - "(type: %d, err: %d), Please "
>> - "run fsck to fix it.", type, err);
>> + "(type: %d, err: %d, ret:%d), Please "
>> + "run fsck to fix it.", type, err, ret);
>> set_sbi_flag(F2FS_SB(sb), SBI_QUOTA_NEED_REPAIR);
>> }
>> }
>> --
>> 2.18.0.rc1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-07 22:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-06 12:44 [PATCH 1/2] f2fs: report error if quota off error during umount Chao Yu
2018-09-06 12:44 ` [PATCH 2/2] f2fs: fix to avoid quota inode leak in ->put_super Chao Yu
2018-09-07 22:38 ` Jaegeuk Kim
2018-09-07 22:53 ` Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).