Skip to content

Commit 019a891

Browse files
chaseyuJaegeuk Kim
authored andcommitted
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>
1 parent deecd28 commit 019a891

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

fs/f2fs/checkpoint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static struct folio *__get_meta_folio(struct f2fs_sb_info *sbi, pgoff_t index,
9393
f2fs_update_iostat(sbi, NULL, FS_META_READ_IO, F2FS_BLKSIZE);
9494

9595
folio_lock(folio);
96-
if (unlikely(folio->mapping != mapping)) {
96+
if (unlikely(!is_meta_folio(folio))) {
9797
f2fs_folio_put(folio, true);
9898
goto repeat;
9999
}
@@ -439,7 +439,7 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
439439

440440
folio_lock(folio);
441441

442-
if (unlikely(folio->mapping != mapping)) {
442+
if (unlikely(!is_meta_folio(folio))) {
443443
continue_unlock:
444444
folio_unlock(folio);
445445
continue;

fs/f2fs/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static void f2fs_write_end_io(struct bio *bio)
354354
STOP_CP_REASON_WRITE_FAIL);
355355
}
356356

357-
f2fs_bug_on(sbi, folio->mapping == NODE_MAPPING(sbi) &&
357+
f2fs_bug_on(sbi, is_node_folio(folio) &&
358358
folio->index != nid_of_node(&folio->page));
359359

360360
dec_page_count(sbi, type);

fs/f2fs/f2fs.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,6 +2088,16 @@ static inline struct address_space *NODE_MAPPING(struct f2fs_sb_info *sbi)
20882088
return sbi->node_inode->i_mapping;
20892089
}
20902090

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+
20912101
static inline bool is_sbi_flag_set(struct f2fs_sb_info *sbi, unsigned int type)
20922102
{
20932103
return test_bit(type, &sbi->s_flag);
@@ -3738,8 +3748,7 @@ struct node_info;
37383748

37393749
int f2fs_check_nid_range(struct f2fs_sb_info *sbi, nid_t nid);
37403750
bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type);
3741-
bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi,
3742-
const struct folio *folio);
3751+
bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi, struct folio *folio);
37433752
void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi);
37443753
void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio);
37453754
void f2fs_reset_fsync_node_info(struct f2fs_sb_info *sbi);

fs/f2fs/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ static int move_data_block(struct inode *inode, block_t bidx,
13821382
F2FS_BLKSIZE);
13831383

13841384
folio_lock(mfolio);
1385-
if (unlikely(mfolio->mapping != META_MAPPING(fio.sbi) ||
1385+
if (unlikely(!is_meta_folio(mfolio) ||
13861386
!folio_test_uptodate(mfolio))) {
13871387
err = -EIO;
13881388
f2fs_folio_put(mfolio, true);

fs/f2fs/node.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ static unsigned int __gang_lookup_nat_set(struct f2fs_nm_info *nm_i,
310310
start, nr);
311311
}
312312

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)
314314
{
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);
317317
}
318318

319319
void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi)
@@ -1222,7 +1222,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from)
12221222
goto fail;
12231223
if (offset[1] == 0 && get_nid(&folio->page, offset[0], true)) {
12241224
folio_lock(folio);
1225-
BUG_ON(folio->mapping != NODE_MAPPING(sbi));
1225+
BUG_ON(!is_node_folio(folio));
12261226
set_nid(folio, offset[0], 0, true);
12271227
folio_unlock(folio);
12281228
}
@@ -1507,7 +1507,7 @@ static struct folio *__get_node_folio(struct f2fs_sb_info *sbi, pgoff_t nid,
15071507

15081508
folio_lock(folio);
15091509

1510-
if (unlikely(folio->mapping != NODE_MAPPING(sbi))) {
1510+
if (unlikely(!is_node_folio(folio))) {
15111511
f2fs_folio_put(folio, true);
15121512
goto repeat;
15131513
}
@@ -1625,7 +1625,7 @@ static struct folio *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino)
16251625

16261626
folio_lock(folio);
16271627

1628-
if (unlikely(folio->mapping != NODE_MAPPING(sbi))) {
1628+
if (unlikely(!is_node_folio(folio))) {
16291629
continue_unlock:
16301630
folio_unlock(folio);
16311631
continue;
@@ -1834,7 +1834,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
18341834

18351835
folio_lock(folio);
18361836

1837-
if (unlikely(folio->mapping != NODE_MAPPING(sbi))) {
1837+
if (unlikely(!is_node_folio(folio))) {
18381838
continue_unlock:
18391839
folio_unlock(folio);
18401840
continue;
@@ -1969,7 +1969,7 @@ void f2fs_flush_inline_data(struct f2fs_sb_info *sbi)
19691969

19701970
folio_lock(folio);
19711971

1972-
if (unlikely(folio->mapping != NODE_MAPPING(sbi)))
1972+
if (unlikely(!is_node_folio(folio)))
19731973
goto unlock;
19741974
if (!folio_test_dirty(folio))
19751975
goto unlock;
@@ -2041,7 +2041,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi,
20412041
else if (!folio_trylock(folio))
20422042
continue;
20432043

2044-
if (unlikely(folio->mapping != NODE_MAPPING(sbi))) {
2044+
if (unlikely(!is_node_folio(folio))) {
20452045
continue_unlock:
20462046
folio_unlock(folio);
20472047
continue;

0 commit comments

Comments
 (0)