[f2fs-dev] [PATCH 039/153] f2fs: Add f2fs_get_sum_folio()

[Matthew Wilcox (Oracle)]

Convert f2fs_get_sum_page() to f2fs_get_sum_folio() and add a
f2fs_get_sum_page() wrapper.

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/f2fs.h    | 8 +++++++-
 fs/f2fs/segment.c | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 55fed88b79e1..55a161d39e4a 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3807,7 +3807,7 @@ int f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);
 int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range);
 bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,
                                        struct cp_control *cpc);
-struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno);
+struct folio *f2fs_get_sum_folio(struct f2fs_sb_info *sbi, unsigned int segno);
 void f2fs_update_meta_page(struct f2fs_sb_info *sbi, void *src,
                                        block_t blk_addr);
 void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct folio *folio,
@@ -3863,6 +3863,12 @@ static inline struct inode *fio_inode(struct 
f2fs_io_info *fio)
        return page_folio(fio->page)->mapping->host;
 }
 
+static inline
+struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno)
+{
+       return &f2fs_get_sum_folio(sbi, segno)->page;
+}
+
 #define DEF_FRAGMENT_SIZE      4
 #define MIN_FRAGMENT_SIZE      1
 #define MAX_FRAGMENT_SIZE      512
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 2f88f9294ba9..a3d4903cfb0b 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -2675,13 +2675,13 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info 
*sbi, bool for_ra)
 }
 
 /*
- * Caller should put this summary page
+ * Caller should put this summary folio
  */
-struct page *f2fs_get_sum_page(struct f2fs_sb_info *sbi, unsigned int segno)
+struct folio *f2fs_get_sum_folio(struct f2fs_sb_info *sbi, unsigned int segno)
 {
        if (unlikely(f2fs_cp_error(sbi)))
                return ERR_PTR(-EIO);
-       return &f2fs_get_meta_folio_retry(sbi, GET_SUM_BLOCK(sbi, segno))->page;
+       return f2fs_get_meta_folio_retry(sbi, GET_SUM_BLOCK(sbi, segno));
 }
 
 void f2fs_update_meta_page(struct f2fs_sb_info *sbi,
-- 
2.47.2



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