]> git.itanic.dy.fi Git - linux-stable/commitdiff
f2fs: remove unnecessary __init_extent_tree
authorJaegeuk Kim <jaegeuk@kernel.org>
Wed, 30 Nov 2022 18:01:18 +0000 (10:01 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:53:52 +0000 (11:53 +0200)
[ Upstream commit 749d543c0d451fff31e8f7a3e0a031ffcbf1ebb1 ]

Added into the caller.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 043d2d00b443 ("f2fs: factor out victim_entry usage from general rb_tree use")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/extent_cache.c

index a626ce0b70a500a0c74771387556485fe66975a5..d3c3b1b627c63bcd5552b5a5ec1772f752cdfaf8 100644 (file)
@@ -386,21 +386,6 @@ static struct extent_tree *__grab_extent_tree(struct inode *inode)
        return et;
 }
 
-static struct extent_node *__init_extent_tree(struct f2fs_sb_info *sbi,
-                               struct extent_tree *et, struct extent_info *ei)
-{
-       struct rb_node **p = &et->root.rb_root.rb_node;
-       struct extent_node *en;
-
-       en = __attach_extent_node(sbi, et, ei, NULL, p, true);
-       if (!en)
-               return NULL;
-
-       et->largest = en->ei;
-       et->cached_en = en;
-       return en;
-}
-
 static unsigned int __free_extent_tree(struct f2fs_sb_info *sbi,
                                        struct extent_tree *et)
 {
@@ -460,8 +445,12 @@ static void __f2fs_init_extent_tree(struct inode *inode, struct page *ipage)
        if (atomic_read(&et->node_cnt))
                goto out;
 
-       en = __init_extent_tree(sbi, et, &ei);
+       en = __attach_extent_node(sbi, et, &ei, NULL,
+                               &et->root.rb_root.rb_node, true);
        if (en) {
+               et->largest = en->ei;
+               et->cached_en = en;
+
                spin_lock(&sbi->extent_lock);
                list_add_tail(&en->list, &sbi->extent_list);
                spin_unlock(&sbi->extent_lock);