ext4: forbid commit inconsistent quota data when errors=remount-ro
PATCH 1/1 ext4: forbid commit inconsistent quota data when errors=remount-ro
There's issue as follows When do IO fault injection test:
Quota error (device dm-3): find_block_dqentry: Quota for id 101 referenced but not present Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 101 Quota error (device dm-3): do_check_range: Getting block 2021161007 out of range 1-186 Quota error (device dm-3): qtree_read_dquot: Can't read quota structure for id 661
Now, ext4_write_dquot()/ext4_acquire_dquot()/ext4_release_dquot() may commit inconsistent quota data even if process failed. This may lead to filesystem corruption.
To ensure filesystem consistent when errors=remount-ro there is need to call ext4_handle_error() to abort journal.
--- fs/ext4/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
fs/ext4/super.c +12 -0
@@ -6873,6 +6873,10 @@ static int ext4_write_dquot(struct dquot *dquot)if (IS_ERR (handle))return PTR_ERR (handle); ret =dquot_commit (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to commit dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;
@@ -6889,6 +6893,10 @@ static int ext4_acquire_dquot(struct dquot *dquot)if (IS_ERR (handle))return PTR_ERR (handle); ret =dquot_acquire (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to acquire dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;
@@ -6908,6 +6916,10 @@ static int ext4_release_dquot(struct dquot *dquot)return PTR_ERR (handle); } ret =dquot_release (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to release dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;
Signature · 1 line
2.31.1
Quoted 6 lines · Ye Bin
There's issue as follows When do IO fault injection test:
Quota error (device dm-3):find_block_dqentry: Quota for id 101 referenced but not present Quota error (device dm-3):qtree_read_dquot: Can't read quota structure for id 101 Quota error (device dm-3):do_check_range: Getting block 2021161007 out of range 1-186 Quota error (device dm-3):qtree_read_dquot: Can't read quota structure for id 661
Quoted 7 lines
Now, ext4_write_dquot()/ext4_acquire_dquot()/ext4_release_dquot() may commit inconsistent quota data even if process failed. This may lead to filesystem corruption.
To ensure filesystem consistent when errors=remount-ro there is need to callext4_handle_error()to abort journal.Signed-off-by Ye Bin <[email protected]>
After thinking about this for a while I agree. Feel free to add:
Honza
Quoted 44 lines
--- fs/ext4/super.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)fs/ext4/super.c +12
-0@@ -6873,6 +6873,10 @@ static int ext4_write_dquot(struct dquot *dquot)if (IS_ERR (handle))return PTR_ERR (handle); ret =dquot_commit (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to commit dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;@@ -6889,6 +6893,10 @@ static int ext4_acquire_dquot(struct dquot *dquot)if (IS_ERR (handle))return PTR_ERR (handle); ret =dquot_acquire (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to acquire dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;@@ -6908,6 +6916,10 @@ static int ext4_release_dquot(struct dquot *dquot)return PTR_ERR (handle); } ret =dquot_release (dquot); +if (ret <0 ) +ext4_error_err (dquot->dq_sb, -ret, +"Failed to release dquot type %d" , + dquot->dq_id.type); err =ext4_journal_stop (handle);if (!ret) ret = err;Signature · 1 line
2.31.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 6 lines · Ye Bin
There's issue as follows When do IO fault injection test:
Quota error (device dm-3):find_block_dqentry: Quota for id 101 referenced but not present Quota error (device dm-3):qtree_read_dquot: Can't read quota structure for id 101 Quota error (device dm-3):do_check_range: Getting block 2021161007 out of range 1-186 Quota error (device dm-3):qtree_read_dquot: Can't read quota structure for id 661
Quoted 7 lines
Now, ext4_write_dquot()/ext4_acquire_dquot()/ext4_release_dquot() may commit inconsistent quota data even if process failed. This may lead to filesystem corruption.
To ensure filesystem consistent when errors=remount-ro there is need to callext4_handle_error()to abort journal.[...]
Applied, thanks!
[1/1] ext4: forbid commit inconsistent quota data when errors=remount-ro
commit: d8b945fa475f13d787df00c26a6dc45a3e2e1d1d
Best regards,
Signature · 1 line
Theodore Ts'o <[email protected]>