From: zhanchengbin <zhanchengbin1@huawei.com>
To: <tytso@mit.edu>, <jack@suse.com>
Cc: <linux-ext4@vger.kernel.org>, <yi.zhang@huawei.com>,
<linfeilong@huawei.com>, <liuzhiqiang26@huawei.com>,
zhanchengbin <zhanchengbin1@huawei.com>
Subject: [PATCH v3 2/2] ext4: restore len when ext4_ext_insert_extent failed
Date: Tue, 7 Feb 2023 15:09:31 +0800 [thread overview]
Message-ID: <20230207070931.2189663-3-zhanchengbin1@huawei.com> (raw)
In-Reply-To: <20230207070931.2189663-1-zhanchengbin1@huawei.com>
Inside the ext4_ext_insert_extent function, every error returned will
not destroy the consistency of the tree. Even if it fails after changing
half of the tree, can also ensure that the tree is self-consistent, like
function ext4_ext_create_new_leaf.
After ext4_ext_insert_extent fails, update extent status tree depends on
the incoming split_flag. So restore the len of extent to be split when
ext4_ext_insert_extent return failed in ext4_split_extent_at.
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
---
fs/ext4/extents.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 3559ea6b0781..b926fef73de4 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -935,6 +935,7 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
bh = read_extent_tree_block(inode, path[ppos].p_idx, --i, flags);
if (IS_ERR(bh)) {
+ EXT4_ERROR_INODE(inode, "IO error reading extent block");
ret = PTR_ERR(bh);
goto err;
}
@@ -3251,7 +3252,7 @@ static int ext4_split_extent_at(handle_t *handle,
ext4_ext_mark_unwritten(ex2);
err = ext4_ext_insert_extent(handle, inode, ppath, &newex, flags);
- if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
+ if (!err)
goto out;
if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
--
2.31.1
next prev parent reply other threads:[~2023-02-07 6:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 7:09 [PATCH v3 0/2] fix extents need to be restored when ext4_ext_insert_extent failed zhanchengbin
2023-02-07 7:09 ` [PATCH v3 1/2] ext4: fix inode tree inconsistency caused by ENOMEM in ext4_split_extent_at zhanchengbin
2023-02-07 7:09 ` zhanchengbin [this message]
2023-02-07 14:23 ` [PATCH v3 2/2] ext4: restore len when ext4_ext_insert_extent failed Jan Kara
2023-02-08 7:10 ` zhanchengbin
2023-02-08 13:12 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230207070931.2189663-3-zhanchengbin1@huawei.com \
--to=zhanchengbin1@huawei.com \
--cc=jack@suse.com \
--cc=linfeilong@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=liuzhiqiang26@huawei.com \
--cc=tytso@mit.edu \
--cc=yi.zhang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox