Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ext4: make ext4_es_insert_extent() return void

Now ext4_es_insert_extent() never return error, so make it return void.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230424033846.4732-12-libaokun1@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Baokun Li and committed by
Theodore Ts'o
6c120399 8782b020

+18 -28
+3 -2
fs/ext4/extents.c
··· 3136 3136 if (ee_len == 0) 3137 3137 return 0; 3138 3138 3139 - return ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, 3140 - EXTENT_STATUS_WRITTEN); 3139 + ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock, 3140 + EXTENT_STATUS_WRITTEN); 3141 + return 0; 3141 3142 } 3142 3143 3143 3144 /* FIXME!! we need to try to merge to left or right after zero-out */
+6 -8
fs/ext4/extents_status.c
··· 829 829 /* 830 830 * ext4_es_insert_extent() adds information to an inode's extent 831 831 * status tree. 832 - * 833 - * Return 0 on success, error code on failure. 834 832 */ 835 - int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 836 - ext4_lblk_t len, ext4_fsblk_t pblk, 837 - unsigned int status) 833 + void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 834 + ext4_lblk_t len, ext4_fsblk_t pblk, 835 + unsigned int status) 838 836 { 839 837 struct extent_status newes; 840 838 ext4_lblk_t end = lblk + len - 1; ··· 843 845 struct extent_status *es2 = NULL; 844 846 845 847 if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY) 846 - return 0; 848 + return; 847 849 848 850 es_debug("add [%u/%u) %llu %x to extent status tree of inode %lu\n", 849 851 lblk, len, pblk, status, inode->i_ino); 850 852 851 853 if (!len) 852 - return 0; 854 + return; 853 855 854 856 BUG_ON(end < lblk); 855 857 ··· 901 903 goto retry; 902 904 903 905 ext4_es_print_tree(inode); 904 - return 0; 906 + return; 905 907 } 906 908 907 909 /*
+3 -3
fs/ext4/extents_status.h
··· 127 127 extern void ext4_exit_es(void); 128 128 extern void ext4_es_init_tree(struct ext4_es_tree *tree); 129 129 130 - extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 131 - ext4_lblk_t len, ext4_fsblk_t pblk, 132 - unsigned int status); 130 + extern void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk, 131 + ext4_lblk_t len, ext4_fsblk_t pblk, 132 + unsigned int status); 133 133 extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, 134 134 ext4_lblk_t len, ext4_fsblk_t pblk, 135 135 unsigned int status);
+6 -15
fs/ext4/inode.c
··· 567 567 ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk, 568 568 map->m_lblk + map->m_len - 1)) 569 569 status |= EXTENT_STATUS_DELAYED; 570 - ret = ext4_es_insert_extent(inode, map->m_lblk, 571 - map->m_len, map->m_pblk, status); 572 - if (ret < 0) 573 - retval = ret; 570 + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, 571 + map->m_pblk, status); 574 572 } 575 573 up_read((&EXT4_I(inode)->i_data_sem)); 576 574 ··· 677 679 ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk, 678 680 map->m_lblk + map->m_len - 1)) 679 681 status |= EXTENT_STATUS_DELAYED; 680 - ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, 681 - map->m_pblk, status); 682 - if (ret < 0) { 683 - retval = ret; 684 - goto out_sem; 685 - } 682 + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, 683 + map->m_pblk, status); 686 684 } 687 685 688 686 out_sem: ··· 1759 1765 set_buffer_new(bh); 1760 1766 set_buffer_delay(bh); 1761 1767 } else if (retval > 0) { 1762 - int ret; 1763 1768 unsigned int status; 1764 1769 1765 1770 if (unlikely(retval != map->m_len)) { ··· 1771 1778 1772 1779 status = map->m_flags & EXT4_MAP_UNWRITTEN ? 1773 1780 EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; 1774 - ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len, 1775 - map->m_pblk, status); 1776 - if (ret != 0) 1777 - retval = ret; 1781 + ext4_es_insert_extent(inode, map->m_lblk, map->m_len, 1782 + map->m_pblk, status); 1778 1783 } 1779 1784 1780 1785 out_unlock: