]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: convert __f2fs_write_meta_page() to use folio
authorChao Yu <chao@kernel.org>
Tue, 13 Aug 2024 14:13:29 +0000 (22:13 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 6 Sep 2024 23:04:47 +0000 (23:04 +0000)
Convert to use folio, so that we can get rid of 'page->index' to
prepare for removal of 'index' field in structure page [1].

[1] https://lore.kernel.org/all/Zp8fgUSIBGQ1TN0D@casper.infradead.org/

Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/checkpoint.c

index d73d4d05313e0da355d00e8ef5a115f005d5743c..ffaf295a198aed6dbfa098894463d7f06dac7cf6 100644 (file)
@@ -345,30 +345,31 @@ static int __f2fs_write_meta_page(struct page *page,
                                enum iostat_type io_type)
 {
        struct f2fs_sb_info *sbi = F2FS_P_SB(page);
+       struct folio *folio = page_folio(page);
 
-       trace_f2fs_writepage(page_folio(page), META);
+       trace_f2fs_writepage(folio, META);
 
        if (unlikely(f2fs_cp_error(sbi))) {
                if (is_sbi_flag_set(sbi, SBI_IS_CLOSE)) {
-                       ClearPageUptodate(page);
+                       folio_clear_uptodate(folio);
                        dec_page_count(sbi, F2FS_DIRTY_META);
-                       unlock_page(page);
+                       folio_unlock(folio);
                        return 0;
                }
                goto redirty_out;
        }
        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
                goto redirty_out;
-       if (wbc->for_reclaim && page->index < GET_SUM_BLOCK(sbi, 0))
+       if (wbc->for_reclaim && folio->index < GET_SUM_BLOCK(sbi, 0))
                goto redirty_out;
 
-       f2fs_do_write_meta_page(sbi, page_folio(page), io_type);
+       f2fs_do_write_meta_page(sbi, folio, io_type);
        dec_page_count(sbi, F2FS_DIRTY_META);
 
        if (wbc->for_reclaim)
                f2fs_submit_merged_write_cond(sbi, NULL, page, 0, META);
 
-       unlock_page(page);
+       folio_unlock(folio);
 
        if (unlikely(f2fs_cp_error(sbi)))
                f2fs_submit_merged_write(sbi, META);