UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ext4: make ext4_zeroout_es() return void 

After ext4_es_insert_extent() returns void, the return value in
ext4_zeroout_es() is also unnecessary, so make it return void too.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230424033846.4732-13-libaokun1@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Baokun Li 2023-04-24 11:38:46 +08:00 committed by Theodore Ts'o
parent 6c120399cd
commit ab8627e104
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/ext4/extents.c
View File

@ -3123,7 +3123,7 @@ void ext4_ext_release(struct super_block *sb)
#endif #endif
} }
static int ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex) static void ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex)
{ {
ext4_lblk_t ee_block; ext4_lblk_t ee_block;
ext4_fsblk_t ee_pblock; ext4_fsblk_t ee_pblock;
@ -3134,11 +3134,10 @@ static int ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex)
ee_pblock = ext4_ext_pblock(ex); ee_pblock = ext4_ext_pblock(ex);
if (ee_len == 0) if (ee_len == 0)
return 0; return;
ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,
EXTENT_STATUS_WRITTEN); EXTENT_STATUS_WRITTEN);
return 0;
} }
/* FIXME!! we need to try to merge to left or right after zero-out */ /* FIXME!! we need to try to merge to left or right after zero-out */
@ -3288,7 +3287,7 @@ static int ext4_split_extent_at(handle_t *handle,
err = ext4_ext_dirty(handle, inode, path + path->p_depth); err = ext4_ext_dirty(handle, inode, path + path->p_depth);
if (!err) if (!err)
/* update extent status tree */ /* update extent status tree */
err = ext4_zeroout_es(inode, &zero_ex); ext4_zeroout_es(inode, &zero_ex);
/* If we failed at this point, we don't know in which /* If we failed at this point, we don't know in which
* state the extent tree exactly is so don't try to fix * state the extent tree exactly is so don't try to fix
* length of the original extent as it may do even more * length of the original extent as it may do even more
@ -3641,9 +3640,8 @@ fallback:
out: out:
/* If we have gotten a failure, don't zero out status tree */ /* If we have gotten a failure, don't zero out status tree */
if (!err) { if (!err) {
err = ext4_zeroout_es(inode, &zero_ex1); ext4_zeroout_es(inode, &zero_ex1);
if (!err) ext4_zeroout_es(inode, &zero_ex2);
err = ext4_zeroout_es(inode, &zero_ex2);
} }
return err ? err : allocated; return err ? err : allocated;
} }