[f2fs-dev] [PATCH 077/153] f2fs: Use folios in truncate_partial_nodes()

[Matthew Wilcox (Oracle)]

Removes two calls to compound_head().

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

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 241b374e8dc8..e29828c2f7b5 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1063,7 +1063,7 @@ static int truncate_nodes(struct dnode_of_data *dn, 
unsigned int nofs,
 static int truncate_partial_nodes(struct dnode_of_data *dn,
                        struct f2fs_inode *ri, int *offset, int depth)
 {
-       struct page *pages[2];
+       struct folio *folios[2];
        nid_t nid[3];
        nid_t child_nid;
        int err = 0;
@@ -1077,45 +1077,45 @@ static int truncate_partial_nodes(struct dnode_of_data 
*dn,
        /* get indirect nodes in the path */
        for (i = 0; i < idx + 1; i++) {
                /* reference count'll be increased */
-               pages[i] = f2fs_get_node_page(F2FS_I_SB(dn->inode), nid[i]);
-               if (IS_ERR(pages[i])) {
-                       err = PTR_ERR(pages[i]);
+               folios[i] = f2fs_get_node_folio(F2FS_I_SB(dn->inode), nid[i]);
+               if (IS_ERR(folios[i])) {
+                       err = PTR_ERR(folios[i]);
                        idx = i - 1;
                        goto fail;
                }
-               nid[i + 1] = get_nid(pages[i], offset[i + 1], false);
+               nid[i + 1] = get_nid(&folios[i]->page, offset[i + 1], false);
        }
 
-       f2fs_ra_node_pages(pages[idx], offset[idx + 1], NIDS_PER_BLOCK);
+       f2fs_ra_node_pages(&folios[idx]->page, offset[idx + 1], NIDS_PER_BLOCK);
 
        /* free direct nodes linked to a partial indirect node */
        for (i = offset[idx + 1]; i < NIDS_PER_BLOCK; i++) {
-               child_nid = get_nid(pages[idx], i, false);
+               child_nid = get_nid(&folios[idx]->page, i, false);
                if (!child_nid)
                        continue;
                dn->nid = child_nid;
                err = truncate_dnode(dn);
                if (err < 0)
                        goto fail;
-               if (set_nid(pages[idx], i, 0, false))
+               if (set_nid(&folios[idx]->page, i, 0, false))
                        dn->node_changed = true;
        }
 
        if (offset[idx + 1] == 0) {
-               dn->node_page = pages[idx];
+               dn->node_page = &folios[idx]->page;
                dn->nid = nid[idx];
                err = truncate_node(dn);
                if (err)
                        goto fail;
        } else {
-               f2fs_put_page(pages[idx], 1);
+               f2fs_folio_put(folios[idx], true);
        }
        offset[idx]++;
        offset[idx + 1] = 0;
        idx--;
 fail:
        for (i = idx; i >= 0; i--)
-               f2fs_put_page(pages[i], 1);
+               f2fs_folio_put(folios[i], true);
 
        trace_f2fs_truncate_partial_nodes(dn->inode, nid, depth, err);
 
-- 
2.47.2



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