[f2fs-dev] [PATCH 093/153] f2fs: Use a folio in f2fs_do_truncate_blocks()

[Matthew Wilcox (Oracle)]

Removes two calls to compound_head().

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

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 90e71b54e1d0..f6835c0d1ce8 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -743,7 +743,7 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 from, 
bool lock)
        struct dnode_of_data dn;
        pgoff_t free_from;
        int count = 0, err = 0;
-       struct page *ipage;
+       struct folio *ifolio;
        bool truncate_page = false;
 
        trace_f2fs_truncate_blocks_enter(inode, from);
@@ -761,9 +761,9 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 from, 
bool lock)
        if (lock)
                f2fs_lock_op(sbi);
 
-       ipage = f2fs_get_inode_page(sbi, inode->i_ino);
-       if (IS_ERR(ipage)) {
-               err = PTR_ERR(ipage);
+       ifolio = f2fs_get_inode_folio(sbi, inode->i_ino);
+       if (IS_ERR(ifolio)) {
+               err = PTR_ERR(ifolio);
                goto out;
        }
 
@@ -776,18 +776,18 @@ int f2fs_do_truncate_blocks(struct inode *inode, u64 
from, bool lock)
                dec_valid_block_count(sbi, inode, ei.len);
                f2fs_update_time(sbi, REQ_TIME);
 
-               f2fs_put_page(ipage, 1);
+               f2fs_folio_put(ifolio, true);
                goto out;
        }
 
        if (f2fs_has_inline_data(inode)) {
-               f2fs_truncate_inline_inode(inode, ipage, from);
-               f2fs_put_page(ipage, 1);
+               f2fs_truncate_inline_inode(inode, &ifolio->page, from);
+               f2fs_folio_put(ifolio, true);
                truncate_page = true;
                goto out;
        }
 
-       set_new_dnode(&dn, inode, ipage, NULL, 0);
+       set_new_dnode(&dn, inode, &ifolio->page, NULL, 0);
        err = f2fs_get_dnode_of_data(&dn, free_from, LOOKUP_NODE_RA);
        if (err) {
                if (err == -ENOENT)
-- 
2.47.2



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