Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: introduce is_{meta,node}_folio

Just cleanup, no changes.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Chao Yu and committed by
Jaegeuk Kim
019a8912 deecd282

+24 -15
+2 -2
fs/f2fs/checkpoint.c
··· 93 93 f2fs_update_iostat(sbi, NULL, FS_META_READ_IO, F2FS_BLKSIZE); 94 94 95 95 folio_lock(folio); 96 - if (unlikely(folio->mapping != mapping)) { 96 + if (unlikely(!is_meta_folio(folio))) { 97 97 f2fs_folio_put(folio, true); 98 98 goto repeat; 99 99 } ··· 439 439 440 440 folio_lock(folio); 441 441 442 - if (unlikely(folio->mapping != mapping)) { 442 + if (unlikely(!is_meta_folio(folio))) { 443 443 continue_unlock: 444 444 folio_unlock(folio); 445 445 continue;
+1 -1
fs/f2fs/data.c
··· 354 354 STOP_CP_REASON_WRITE_FAIL); 355 355 } 356 356 357 - f2fs_bug_on(sbi, folio->mapping == NODE_MAPPING(sbi) && 357 + f2fs_bug_on(sbi, is_node_folio(folio) && 358 358 folio->index != nid_of_node(&folio->page)); 359 359 360 360 dec_page_count(sbi, type);
+11 -2
fs/f2fs/f2fs.h
··· 2088 2088 return sbi->node_inode->i_mapping; 2089 2089 } 2090 2090 2091 + static inline bool is_meta_folio(struct folio *folio) 2092 + { 2093 + return folio->mapping == META_MAPPING(F2FS_F_SB(folio)); 2094 + } 2095 + 2096 + static inline bool is_node_folio(struct folio *folio) 2097 + { 2098 + return folio->mapping == NODE_MAPPING(F2FS_F_SB(folio)); 2099 + } 2100 + 2091 2101 static inline bool is_sbi_flag_set(struct f2fs_sb_info *sbi, unsigned int type) 2092 2102 { 2093 2103 return test_bit(type, &sbi->s_flag); ··· 3748 3738 3749 3739 int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid); 3750 3740 bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type); 3751 - bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, 3752 - const struct folio *folio); 3741 + bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct folio *folio); 3753 3742 void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi); 3754 3743 void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio); 3755 3744 void f2fs_reset_fsync_node_info(struct f2fs_sb_info *sbi);
+1 -1
fs/f2fs/gc.c
··· 1382 1382 F2FS_BLKSIZE); 1383 1383 1384 1384 folio_lock(mfolio); 1385 - if (unlikely(mfolio->mapping != META_MAPPING(fio.sbi) || 1385 + if (unlikely(!is_meta_folio(mfolio) || 1386 1386 !folio_test_uptodate(mfolio))) { 1387 1387 err = -EIO; 1388 1388 f2fs_folio_put(mfolio, true);
+9 -9
fs/f2fs/node.c
··· 310 310 start, nr); 311 311 } 312 312 313 - bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, const struct folio *folio) 313 + bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct folio *folio) 314 314 { 315 - return NODE_MAPPING(sbi) == folio->mapping && 316 - IS_DNODE(&folio->page) && is_cold_node(&folio->page); 315 + return is_node_folio(folio) && IS_DNODE(&folio->page) && 316 + is_cold_node(&folio->page); 317 317 } 318 318 319 319 void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi) ··· 1222 1222 goto fail; 1223 1223 if (offset[1] == 0 && get_nid(&folio->page, offset[0], true)) { 1224 1224 folio_lock(folio); 1225 - BUG_ON(folio->mapping != NODE_MAPPING(sbi)); 1225 + BUG_ON(!is_node_folio(folio)); 1226 1226 set_nid(folio, offset[0], 0, true); 1227 1227 folio_unlock(folio); 1228 1228 } ··· 1507 1507 1508 1508 folio_lock(folio); 1509 1509 1510 - if (unlikely(folio->mapping != NODE_MAPPING(sbi))) { 1510 + if (unlikely(!is_node_folio(folio))) { 1511 1511 f2fs_folio_put(folio, true); 1512 1512 goto repeat; 1513 1513 } ··· 1625 1625 1626 1626 folio_lock(folio); 1627 1627 1628 - if (unlikely(folio->mapping != NODE_MAPPING(sbi))) { 1628 + if (unlikely(!is_node_folio(folio))) { 1629 1629 continue_unlock: 1630 1630 folio_unlock(folio); 1631 1631 continue; ··· 1834 1834 1835 1835 folio_lock(folio); 1836 1836 1837 - if (unlikely(folio->mapping != NODE_MAPPING(sbi))) { 1837 + if (unlikely(!is_node_folio(folio))) { 1838 1838 continue_unlock: 1839 1839 folio_unlock(folio); 1840 1840 continue; ··· 1969 1969 1970 1970 folio_lock(folio); 1971 1971 1972 - if (unlikely(folio->mapping != NODE_MAPPING(sbi))) 1972 + if (unlikely(!is_node_folio(folio))) 1973 1973 goto unlock; 1974 1974 if (!folio_test_dirty(folio)) 1975 1975 goto unlock; ··· 2041 2041 else if (!folio_trylock(folio)) 2042 2042 continue; 2043 2043 2044 - if (unlikely(folio->mapping != NODE_MAPPING(sbi))) { 2044 + if (unlikely(!is_node_folio(folio))) { 2045 2045 continue_unlock: 2046 2046 folio_unlock(folio); 2047 2047 continue;