mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
ext4: using nofail preallocation in ext4_es_insert_extent()
[ Upstream commit2a69c45008
] Similar to in ext4_es_insert_delayed_block(), we use preallocations that do not fail to avoid inconsistencies, but we do not care about es that are not must be kept, and we return 0 even if such es memory allocation fails. Suggested-by: Jan Kara <jack@suse.cz> Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20230424033846.4732-9-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Stable-dep-of:8e387c89e9
("ext4: make sure allocate pending entry not fail") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
048e7f38b3
commit
859893f619
1 changed files with 27 additions and 13 deletions
|
@ -841,8 +841,11 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
|
||||||
{
|
{
|
||||||
struct extent_status newes;
|
struct extent_status newes;
|
||||||
ext4_lblk_t end = lblk + len - 1;
|
ext4_lblk_t end = lblk + len - 1;
|
||||||
int err = 0;
|
int err1 = 0;
|
||||||
|
int err2 = 0;
|
||||||
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
||||||
|
struct extent_status *es1 = NULL;
|
||||||
|
struct extent_status *es2 = NULL;
|
||||||
|
|
||||||
if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)
|
if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -870,29 +873,40 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
|
||||||
|
|
||||||
ext4_es_insert_extent_check(inode, &newes);
|
ext4_es_insert_extent_check(inode, &newes);
|
||||||
|
|
||||||
write_lock(&EXT4_I(inode)->i_es_lock);
|
|
||||||
err = __es_remove_extent(inode, lblk, end, NULL, NULL);
|
|
||||||
if (err != 0)
|
|
||||||
goto error;
|
|
||||||
retry:
|
retry:
|
||||||
err = __es_insert_extent(inode, &newes, NULL);
|
if (err1 && !es1)
|
||||||
if (err == -ENOMEM && __es_shrink(EXT4_SB(inode->i_sb),
|
es1 = __es_alloc_extent(true);
|
||||||
128, EXT4_I(inode)))
|
if ((err1 || err2) && !es2)
|
||||||
goto retry;
|
es2 = __es_alloc_extent(true);
|
||||||
if (err == -ENOMEM && !ext4_es_must_keep(&newes))
|
write_lock(&EXT4_I(inode)->i_es_lock);
|
||||||
err = 0;
|
|
||||||
|
err1 = __es_remove_extent(inode, lblk, end, NULL, es1);
|
||||||
|
if (err1 != 0)
|
||||||
|
goto error;
|
||||||
|
|
||||||
|
err2 = __es_insert_extent(inode, &newes, es2);
|
||||||
|
if (err2 == -ENOMEM && !ext4_es_must_keep(&newes))
|
||||||
|
err2 = 0;
|
||||||
|
if (err2 != 0)
|
||||||
|
goto error;
|
||||||
|
|
||||||
if (sbi->s_cluster_ratio > 1 && test_opt(inode->i_sb, DELALLOC) &&
|
if (sbi->s_cluster_ratio > 1 && test_opt(inode->i_sb, DELALLOC) &&
|
||||||
(status & EXTENT_STATUS_WRITTEN ||
|
(status & EXTENT_STATUS_WRITTEN ||
|
||||||
status & EXTENT_STATUS_UNWRITTEN))
|
status & EXTENT_STATUS_UNWRITTEN))
|
||||||
__revise_pending(inode, lblk, len);
|
__revise_pending(inode, lblk, len);
|
||||||
|
|
||||||
|
/* es is pre-allocated but not used, free it. */
|
||||||
|
if (es1 && !es1->es_len)
|
||||||
|
__es_free_extent(es1);
|
||||||
|
if (es2 && !es2->es_len)
|
||||||
|
__es_free_extent(es2);
|
||||||
error:
|
error:
|
||||||
write_unlock(&EXT4_I(inode)->i_es_lock);
|
write_unlock(&EXT4_I(inode)->i_es_lock);
|
||||||
|
if (err1 || err2)
|
||||||
|
goto retry;
|
||||||
|
|
||||||
ext4_es_print_tree(inode);
|
ext4_es_print_tree(inode);
|
||||||
|
return 0;
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue