ext4: make ext4_es_insert_extent() return void

[ Upstream commit 6c120399cde6b1b5cf65ce403765c579fb3d3e50 ]

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>
Stable-dep-of: acf795dc161f ("ext4: convert to exclusive lock while inserting delalloc extents")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 68aa8760cb465c892245032e069ffe7ec16a807b..9e125927279149ee5e0d886289383cb6af92b764 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -3107,8 +3107,9 @@ static int ext4_zeroout_es(struct inode *inode, struct ext4_extent *ex)
        if (ee_len == 0)
                return 0;
 
-       return ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,
-                                    EXTENT_STATUS_WRITTEN);
+       ext4_es_insert_extent(inode, ee_block, ee_len, ee_pblock,
+                             EXTENT_STATUS_WRITTEN);
+       return 0;
 }
 
 /* FIXME!! we need to try to merge to left or right after zero-out  */

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index cccbdfd49a86b6ea1cc7d8566dd182244b1808ea..f37e62546745b0844950380a41e4af5d484d0301 100644 (file)
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -846,12 +846,10 @@ out:
 /*
  * ext4_es_insert_extent() adds information to an inode's extent
  * status tree.
- *
- * Return 0 on success, error code on failure.
  */
-int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
-                         ext4_lblk_t len, ext4_fsblk_t pblk,
-                         unsigned int status)
+void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
+                          ext4_lblk_t len, ext4_fsblk_t pblk,
+                          unsigned int status)
 {
        struct extent_status newes;
        ext4_lblk_t end = lblk + len - 1;
@@ -863,13 +861,13 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
        bool revise_pending = false;
 
        if (EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)
-               return 0;
+               return;
 
        es_debug("add [%u/%u) %llu %x to extent status tree of inode %lu\n",
                 lblk, len, pblk, status, inode->i_ino);
 
        if (!len)
-               return 0;
+               return;
 
        BUG_ON(end < lblk);
 
@@ -938,7 +936,7 @@ error:
                goto retry;
 
        ext4_es_print_tree(inode);
-       return 0;
+       return;
 }
 
 /*

diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h
index 4ec30a79826050bf65882d394ec104421649fd94..481ec4381bee6ee5317ff8f8a3fcfe0cd78f3330 100644 (file)
--- a/fs/ext4/extents_status.h
+++ b/fs/ext4/extents_status.h
@@ -127,9 +127,9 @@ extern int __init ext4_init_es(void);
 extern void ext4_exit_es(void);
 extern void ext4_es_init_tree(struct ext4_es_tree *tree);
 
-extern int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
-                                ext4_lblk_t len, ext4_fsblk_t pblk,
-                                unsigned int status);
+extern void ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
+                                 ext4_lblk_t len, ext4_fsblk_t pblk,
+                                 unsigned int status);
 extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk,
                                 ext4_lblk_t len, ext4_fsblk_t pblk,
                                 unsigned int status);

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 365c4d3a434ab3f10936524f897837f4f0c6298c..ab2a7f990288793d6f8c6dbcd4fe6d2b906ccbe6 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -589,10 +589,8 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
                    ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk,
                                       map->m_lblk + map->m_len - 1))
                        status |= EXTENT_STATUS_DELAYED;
-               ret = ext4_es_insert_extent(inode, map->m_lblk,
-                                           map->m_len, map->m_pblk, status);
-               if (ret < 0)
-                       retval = ret;
+               ext4_es_insert_extent(inode, map->m_lblk, map->m_len,
+                                     map->m_pblk, status);
        }
        up_read((&EXT4_I(inode)->i_data_sem));
 
@@ -701,12 +699,8 @@ found:
                    ext4_es_scan_range(inode, &ext4_es_is_delayed, map->m_lblk,
                                       map->m_lblk + map->m_len - 1))
                        status |= EXTENT_STATUS_DELAYED;
-               ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len,
-                                           map->m_pblk, status);
-               if (ret < 0) {
-                       retval = ret;
-                       goto out_sem;
-               }
+               ext4_es_insert_extent(inode, map->m_lblk, map->m_len,
+                                     map->m_pblk, status);
        }
 
 out_sem:
@@ -1800,7 +1794,6 @@ add_delayed:
                set_buffer_new(bh);
                set_buffer_delay(bh);
        } else if (retval > 0) {
-               int ret;
                unsigned int status;
 
                if (unlikely(retval != map->m_len)) {
@@ -1813,10 +1806,8 @@ add_delayed:
 
                status = map->m_flags & EXT4_MAP_UNWRITTEN ?
                                EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN;
-               ret = ext4_es_insert_extent(inode, map->m_lblk, map->m_len,
-                                           map->m_pblk, status);
-               if (ret != 0)
-                       retval = ret;
+               ext4_es_insert_extent(inode, map->m_lblk, map->m_len,
+                                     map->m_pblk, status);
        }
 
 out_unlock: