[f2fs-dev] [PATCH 076/153] f2fs: Use a folio in truncate_nodes()

[Matthew Wilcox (Oracle)]

Remove two calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/node.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 8a94bae2ab78..241b374e8dc8 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -987,7 +987,7 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
                                                int ofs, int depth)
 {
        struct dnode_of_data rdn = *dn;
-       struct page *page;
+       struct folio *folio;
        struct f2fs_node *rn;
        nid_t child_nid;
        unsigned int child_nofs;
@@ -999,15 +999,15 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
 
        trace_f2fs_truncate_nodes_enter(dn->inode, dn->nid, dn->data_blkaddr);
 
-       page = f2fs_get_node_page(F2FS_I_SB(dn->inode), dn->nid);
-       if (IS_ERR(page)) {
-               trace_f2fs_truncate_nodes_exit(dn->inode, PTR_ERR(page));
-               return PTR_ERR(page);
+       folio = f2fs_get_node_folio(F2FS_I_SB(dn->inode), dn->nid);
+       if (IS_ERR(folio)) {
+               trace_f2fs_truncate_nodes_exit(dn->inode, PTR_ERR(folio));
+               return PTR_ERR(folio);
        }
 
-       f2fs_ra_node_pages(page, ofs, NIDS_PER_BLOCK);
+       f2fs_ra_node_pages(&folio->page, ofs, NIDS_PER_BLOCK);
 
-       rn = F2FS_NODE(page);
+       rn = F2FS_NODE(&folio->page);
        if (depth < 3) {
                for (i = ofs; i < NIDS_PER_BLOCK; i++, freed++) {
                        child_nid = le32_to_cpu(rn->in.nid[i]);
@@ -1017,7 +1017,7 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
                        ret = truncate_dnode(&rdn);
                        if (ret < 0)
                                goto out_err;
-                       if (set_nid(page, i, 0, false))
+                       if (set_nid(&folio->page, i, 0, false))
                                dn->node_changed = true;
                }
        } else {
@@ -1031,7 +1031,7 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
                        rdn.nid = child_nid;
                        ret = truncate_nodes(&rdn, child_nofs, 0, depth - 1);
                        if (ret == (NIDS_PER_BLOCK + 1)) {
-                               if (set_nid(page, i, 0, false))
+                               if (set_nid(&folio->page, i, 0, false))
                                        dn->node_changed = true;
                                child_nofs += ret;
                        } else if (ret < 0 && ret != -ENOENT) {
@@ -1043,19 +1043,19 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
 
        if (!ofs) {
                /* remove current indirect node */
-               dn->node_page = page;
+               dn->node_page = &folio->page;
                ret = truncate_node(dn);
                if (ret)
                        goto out_err;
                freed++;
        } else {
-               f2fs_put_page(page, 1);
+               f2fs_folio_put(folio, true);
        }
        trace_f2fs_truncate_nodes_exit(dn->inode, freed);
        return freed;
 
 out_err:
-       f2fs_put_page(page, 1);
+       f2fs_folio_put(folio, true);
        trace_f2fs_truncate_nodes_exit(dn->inode, ret);
        return ret;
 }
-- 
2.47.2



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel