ext4: factor out ext4_free_ext_path()

Factor out ext4_free_ext_path() to free extent path. As after previous patch
'ext4_ext_drop_refs()' is only used in 'extents.c', so make it static.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220924021211.3831551-3-yebin10@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index a9015cec2c399fed1ef69d3d5f3e84d33142f7cf..9a3521e95f00eb6fe6a6880353f51d07a665d1db 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -3709,7 +3709,7 @@ extern int ext4_ext_insert_extent(handle_t *, struct inode *,
 extern struct ext4_ext_path *ext4_find_extent(struct inode *, ext4_lblk_t,
                                              struct ext4_ext_path **,
                                              int flags);
-extern void ext4_ext_drop_refs(struct ext4_ext_path *);
+extern void ext4_free_ext_path(struct ext4_ext_path *);
 extern int ext4_ext_check_inode(struct inode *inode);
 extern ext4_lblk_t ext4_ext_next_allocated_block(struct ext4_ext_path *path);
 extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 5235974126bd351839a87583c5741bfcc3d7d32f..f1956288307f39f497cc088b77bdc4363b3f0fed 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -106,6 +106,25 @@ static int ext4_ext_trunc_restart_fn(struct inode *inode, int *dropped)
        return 0;
 }
 
+static void ext4_ext_drop_refs(struct ext4_ext_path *path)
+{
+       int depth, i;
+
+       if (!path)
+               return;
+       depth = path->p_depth;
+       for (i = 0; i <= depth; i++, path++) {
+               brelse(path->p_bh);
+               path->p_bh = NULL;
+       }
+}
+
+void ext4_free_ext_path(struct ext4_ext_path *path)
+{
+       ext4_ext_drop_refs(path);
+       kfree(path);
+}
+
 /*
  * Make sure 'handle' has at least 'check_cred' credits. If not, restart
  * transaction with 'restart_cred' credits. The function drops i_data_sem
@@ -636,8 +655,7 @@ int ext4_ext_precache(struct inode *inode)
        ext4_set_inode_state(inode, EXT4_STATE_EXT_PRECACHED);
 out:
        up_read(&ei->i_data_sem);
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        return ret;
 }
 
@@ -724,19 +742,6 @@ static void ext4_ext_show_move(struct inode *inode, struct ext4_ext_path *path,
 #define ext4_ext_show_move(inode, path, newblock, level)
 #endif
 
-void ext4_ext_drop_refs(struct ext4_ext_path *path)
-{
-       int depth, i;
-
-       if (!path)
-               return;
-       depth = path->p_depth;
-       for (i = 0; i <= depth; i++, path++) {
-               brelse(path->p_bh);
-               path->p_bh = NULL;
-       }
-}
-
 /*
  * ext4_ext_binsearch_idx:
  * binary search for the closest index of the given block
@@ -955,8 +960,7 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
        return path;
 
 err:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        if (orig_path)
                *orig_path = NULL;
        return ERR_PTR(ret);
@@ -2174,8 +2178,7 @@ merge:
        err = ext4_ext_dirty(handle, inode, path + path->p_depth);
 
 cleanup:
-       ext4_ext_drop_refs(npath);
-       kfree(npath);
+       ext4_free_ext_path(npath);
        return err;
 }
 
@@ -3061,8 +3064,7 @@ again:
                }
        }
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        path = NULL;
        if (err == -EAGAIN)
                goto again;
@@ -4375,8 +4377,7 @@ got_allocated_blocks:
        allocated = map->m_len;
        ext4_ext_show_leaf(inode, path);
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 
        trace_ext4_ext_map_blocks_exit(inode, flags, map,
                                       err ? err : allocated);
@@ -5245,8 +5246,7 @@ again:
                        break;
        }
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        return ret;
 }
 
@@ -5538,15 +5538,13 @@ static int ext4_insert_range(struct file *file, loff_t offset, loff_t len)
                                        EXT4_GET_BLOCKS_METADATA_NOFAIL);
                }
 
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
                if (ret < 0) {
                        up_write(&EXT4_I(inode)->i_data_sem);
                        goto out_stop;
                }
        } else {
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
        }
 
        ret = ext4_es_remove_extent(inode, offset_lblk,
@@ -5766,10 +5764,8 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1,
                count -= len;
 
        repeat:
-               ext4_ext_drop_refs(path1);
-               kfree(path1);
-               ext4_ext_drop_refs(path2);
-               kfree(path2);
+               ext4_free_ext_path(path1);
+               ext4_free_ext_path(path2);
                path1 = path2 = NULL;
        }
        return replaced_count;
@@ -5848,8 +5844,7 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)
        }
 
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 
        return err ? err : mapped;
 }
@@ -5916,8 +5911,7 @@ int ext4_ext_replay_update_ex(struct inode *inode, ext4_lblk_t start,
        ret = ext4_ext_dirty(NULL, inode, &path[path->p_depth]);
        up_write(&EXT4_I(inode)->i_data_sem);
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        ext4_mark_inode_dirty(NULL, inode);
        return ret;
 }
@@ -5935,8 +5929,7 @@ void ext4_ext_replay_shrink_inode(struct inode *inode, ext4_lblk_t end)
                        return;
                ex = path[path->p_depth].p_ext;
                if (!ex) {
-                       ext4_ext_drop_refs(path);
-                       kfree(path);
+                       ext4_free_ext_path(path);
                        ext4_mark_inode_dirty(NULL, inode);
                        return;
                }
@@ -5949,8 +5942,7 @@ void ext4_ext_replay_shrink_inode(struct inode *inode, ext4_lblk_t end)
                ext4_ext_dirty(NULL, inode, &path[path->p_depth]);
                up_write(&EXT4_I(inode)->i_data_sem);
                ext4_mark_inode_dirty(NULL, inode);
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
        }
 }
 
@@ -5989,13 +5981,11 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)
                return PTR_ERR(path);
        ex = path[path->p_depth].p_ext;
        if (!ex) {
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
                goto out;
        }
        end = le32_to_cpu(ex->ee_block) + ext4_ext_get_actual_len(ex);
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 
        /* Count the number of data blocks */
        cur = 0;
@@ -6025,30 +6015,26 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)
        if (IS_ERR(path))
                goto out;
        numblks += path->p_depth;
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        while (cur < end) {
                path = ext4_find_extent(inode, cur, NULL, 0);
                if (IS_ERR(path))
                        break;
                ex = path[path->p_depth].p_ext;
                if (!ex) {
-                       ext4_ext_drop_refs(path);
-                       kfree(path);
+                       ext4_free_ext_path(path);
                        return 0;
                }
                cur = max(cur + 1, le32_to_cpu(ex->ee_block) +
                                        ext4_ext_get_actual_len(ex));
                ret = skip_hole(inode, &cur);
                if (ret < 0) {
-                       ext4_ext_drop_refs(path);
-                       kfree(path);
+                       ext4_free_ext_path(path);
                        break;
                }
                path2 = ext4_find_extent(inode, cur, NULL, 0);
                if (IS_ERR(path2)) {
-                       ext4_ext_drop_refs(path);
-                       kfree(path);
+                       ext4_free_ext_path(path);
                        break;
                }
                for (i = 0; i <= max(path->p_depth, path2->p_depth); i++) {
@@ -6062,10 +6048,8 @@ int ext4_ext_replay_set_iblocks(struct inode *inode)
                        if (cmp1 != cmp2 && cmp2 != 0)
                                numblks++;
                }
-               ext4_ext_drop_refs(path);
-               ext4_ext_drop_refs(path2);
-               kfree(path);
-               kfree(path2);
+               ext4_free_ext_path(path);
+               ext4_free_ext_path(path2);
        }
 
 out:
@@ -6092,13 +6076,11 @@ int ext4_ext_clear_bb(struct inode *inode)
                return PTR_ERR(path);
        ex = path[path->p_depth].p_ext;
        if (!ex) {
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
                return 0;
        }
        end = le32_to_cpu(ex->ee_block) + ext4_ext_get_actual_len(ex);
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 
        cur = 0;
        while (cur < end) {
@@ -6117,8 +6099,7 @@ int ext4_ext_clear_bb(struct inode *inode)
                                        ext4_fc_record_regions(inode->i_sb, inode->i_ino,
                                                        0, path[j].p_block, 1, 1);
                                }
-                               ext4_ext_drop_refs(path);
-                               kfree(path);
+                               ext4_free_ext_path(path);
                        }
                        ext4_mb_mark_bb(inode->i_sb, map.m_pblk, map.m_len, 0);
                        ext4_fc_record_regions(inode->i_sb, inode->i_ino,

diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
index 23167efda95ee14659f70ec91a429ebd0a32a984..cd0a861853e3f66268b56420616a4031fefbada9 100644 (file)
--- a/fs/ext4/extents_status.c
+++ b/fs/ext4/extents_status.c
@@ -667,8 +667,7 @@ static void ext4_es_insert_extent_ext_check(struct inode *inode,
                }
        }
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 }
 
 static void ext4_es_insert_extent_ind_check(struct inode *inode,

diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c
index 9549d89b3519a4fbdb13d735281cc9e31097edd7..54ccc61c713a85f83840b412c7289a6455742c4f 100644 (file)
--- a/fs/ext4/fast_commit.c
+++ b/fs/ext4/fast_commit.c
@@ -1770,8 +1770,7 @@ static int ext4_fc_replay_add_range(struct super_block *sb,
                        ret = ext4_ext_insert_extent(
                                NULL, inode, &path, &newex, 0);
                        up_write((&EXT4_I(inode)->i_data_sem));
-                       ext4_ext_drop_refs(path);
-                       kfree(path);
+                       ext4_free_ext_path(path);
                        if (ret)
                                goto out;
                        goto next;
@@ -1926,8 +1925,7 @@ static void ext4_fc_set_bitmaps_and_counters(struct super_block *sb)
                                        for (j = 0; j < path->p_depth; j++)
                                                ext4_mb_mark_bb(inode->i_sb,
                                                        path[j].p_block, 1, 1);
-                                       ext4_ext_drop_refs(path);
-                                       kfree(path);
+                                       ext4_free_ext_path(path);
                                }
                                cur += ret;
                                ext4_mb_mark_bb(inode->i_sb, map.m_pblk,

diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index 54e7d3c95fd716b6857c0e53ae3314f142fbe51c..0a220ec9862de3ca520d609ec2803008b0412556 100644 (file)
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -56,8 +56,7 @@ static int finish_range(handle_t *handle, struct inode *inode,
        retval = ext4_ext_insert_extent(handle, inode, &path, &newext, 0);
 err_out:
        up_write((&EXT4_I(inode)->i_data_sem));
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        lb->first_pblock = 0;
        return retval;
 }

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 93ceee6d4caa7af6575afbe0f7c4176401677535..044e34cd835c125d3b487414a6ae7b0bb6f570ca 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -32,8 +32,7 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
        if (IS_ERR(path))
                return PTR_ERR(path);
        if (path[ext_depth(inode)].p_ext == NULL) {
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
                *ppath = NULL;
                return -ENODATA;
        }
@@ -106,8 +105,7 @@ mext_check_coverage(struct inode *inode, ext4_lblk_t from, ext4_lblk_t count,
        }
        ret = 1;
 out:
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        return ret;
 }
 
@@ -691,8 +689,7 @@ out:
                ext4_discard_preallocations(donor_inode, 0);
        }
 
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
        ext4_double_up_write_data_sem(orig_inode, donor_inode);
        unlock_two_nondirectories(orig_inode, donor_inode);
 

diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c
index b051d19b5c8a04cf313b440782c396f482140011..20cadfb740dc32aed2c37368207fe6add8de2ec9 100644 (file)
--- a/fs/ext4/verity.c
+++ b/fs/ext4/verity.c
@@ -298,16 +298,14 @@ static int ext4_get_verity_descriptor_location(struct inode *inode,
        last_extent = path[path->p_depth].p_ext;
        if (!last_extent) {
                EXT4_ERROR_INODE(inode, "verity file has no extents");
-               ext4_ext_drop_refs(path);
-               kfree(path);
+               ext4_free_ext_path(path);
                return -EFSCORRUPTED;
        }
 
        end_lblk = le32_to_cpu(last_extent->ee_block) +
                   ext4_ext_get_actual_len(last_extent);
        desc_size_pos = (u64)end_lblk << inode->i_blkbits;
-       ext4_ext_drop_refs(path);
-       kfree(path);
+       ext4_free_ext_path(path);
 
        if (desc_size_pos < sizeof(desc_size_disk))
                goto bad;