]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ext4: forbid commit inconsistent quota data when errors=remount-ro
authorYe Bin <yebin10@huawei.com>
Fri, 19 Jan 2024 06:29:08 +0000 (14:29 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 11:01:45 +0000 (13:01 +0200)
[ Upstream commit d8b945fa475f13d787df00c26a6dc45a3e2e1d1d ]

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.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240119062908.3598806-1-yebin10@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ext4/super.c

index 8b276b95a7904fb12cbd1b7426b52f33a096a827..b09b7a6b7a154c8a14a24f9ba5952078d5be10a4 100644 (file)
@@ -6170,6 +6170,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;
@@ -6186,6 +6190,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;
@@ -6205,6 +6213,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;