Skip to content

Commit 963da02

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Convert fsync_node_entry->page to folio
Convert all callers to set/get a folio instead of a page. Removes five calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 7d28f13 commit 963da02

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

fs/f2fs/data.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ static void f2fs_write_end_io(struct bio *bio)
359359

360360
dec_page_count(sbi, type);
361361
if (f2fs_in_warm_node_list(sbi, folio))
362-
f2fs_del_fsync_node_entry(sbi, &folio->page);
362+
f2fs_del_fsync_node_entry(sbi, folio);
363363
clear_page_private_gcing(&folio->page);
364364
folio_end_writeback(folio);
365365
}

fs/f2fs/f2fs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ struct inode_entry {
324324

325325
struct fsync_node_entry {
326326
struct list_head list; /* list head */
327-
struct page *page; /* warm node page pointer */
327+
struct folio *folio; /* warm node folio pointer */
328328
unsigned int seq_id; /* sequence id */
329329
};
330330

@@ -3735,7 +3735,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type);
37353735
bool f2fs_in_warm_node_list(struct f2fs_sb_info *sbi,
37363736
const struct folio *folio);
37373737
void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi);
3738-
void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct page *page);
3738+
void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio);
37393739
void f2fs_reset_fsync_node_info(struct f2fs_sb_info *sbi);
37403740
int f2fs_need_dentry_mark(struct f2fs_sb_info *sbi, nid_t nid);
37413741
bool f2fs_is_checkpointed_node(struct f2fs_sb_info *sbi, nid_t nid);

fs/f2fs/node.c

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void f2fs_init_fsync_node_info(struct f2fs_sb_info *sbi)
325325
}
326326

327327
static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,
328-
struct page *page)
328+
struct folio *folio)
329329
{
330330
struct fsync_node_entry *fn;
331331
unsigned long flags;
@@ -334,8 +334,8 @@ static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,
334334
fn = f2fs_kmem_cache_alloc(fsync_node_entry_slab,
335335
GFP_NOFS, true, NULL);
336336

337-
get_page(page);
338-
fn->page = page;
337+
folio_get(folio);
338+
fn->folio = folio;
339339
INIT_LIST_HEAD(&fn->list);
340340

341341
spin_lock_irqsave(&sbi->fsync_node_lock, flags);
@@ -348,19 +348,19 @@ static unsigned int f2fs_add_fsync_node_entry(struct f2fs_sb_info *sbi,
348348
return seq_id;
349349
}
350350

351-
void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct page *page)
351+
void f2fs_del_fsync_node_entry(struct f2fs_sb_info *sbi, struct folio *folio)
352352
{
353353
struct fsync_node_entry *fn;
354354
unsigned long flags;
355355

356356
spin_lock_irqsave(&sbi->fsync_node_lock, flags);
357357
list_for_each_entry(fn, &sbi->fsync_node_list, list) {
358-
if (fn->page == page) {
358+
if (fn->folio == folio) {
359359
list_del(&fn->list);
360360
sbi->fsync_node_num--;
361361
spin_unlock_irqrestore(&sbi->fsync_node_lock, flags);
362362
kmem_cache_free(fsync_node_entry_slab, fn);
363-
put_page(page);
363+
folio_put(folio);
364364
return;
365365
}
366366
}
@@ -1727,7 +1727,7 @@ static int __write_node_folio(struct folio *folio, bool atomic, bool *submitted,
17271727

17281728
/* should add to global list before clearing PAGECACHE status */
17291729
if (f2fs_in_warm_node_list(sbi, folio)) {
1730-
seq = f2fs_add_fsync_node_entry(sbi, &folio->page);
1730+
seq = f2fs_add_fsync_node_entry(sbi, folio);
17311731
if (seq_id)
17321732
*seq_id = seq;
17331733
}
@@ -2129,12 +2129,13 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,
21292129
unsigned int seq_id)
21302130
{
21312131
struct fsync_node_entry *fn;
2132-
struct page *page;
21332132
struct list_head *head = &sbi->fsync_node_list;
21342133
unsigned long flags;
21352134
unsigned int cur_seq_id = 0;
21362135

21372136
while (seq_id && cur_seq_id < seq_id) {
2137+
struct folio *folio;
2138+
21382139
spin_lock_irqsave(&sbi->fsync_node_lock, flags);
21392140
if (list_empty(head)) {
21402141
spin_unlock_irqrestore(&sbi->fsync_node_lock, flags);
@@ -2146,13 +2147,13 @@ int f2fs_wait_on_node_pages_writeback(struct f2fs_sb_info *sbi,
21462147
break;
21472148
}
21482149
cur_seq_id = fn->seq_id;
2149-
page = fn->page;
2150-
get_page(page);
2150+
folio = fn->folio;
2151+
folio_get(folio);
21512152
spin_unlock_irqrestore(&sbi->fsync_node_lock, flags);
21522153

2153-
f2fs_wait_on_page_writeback(page, NODE, true, false);
2154+
f2fs_folio_wait_writeback(folio, NODE, true, false);
21542155

2155-
put_page(page);
2156+
folio_put(folio);
21562157
}
21572158

21582159
return filemap_check_errors(NODE_MAPPING(sbi));

fs/f2fs/segment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3924,7 +3924,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
39243924
fscrypt_finalize_bounce_page(&fio->encrypted_page);
39253925
folio_end_writeback(folio);
39263926
if (f2fs_in_warm_node_list(fio->sbi, folio))
3927-
f2fs_del_fsync_node_entry(fio->sbi, fio->page);
3927+
f2fs_del_fsync_node_entry(fio->sbi, folio);
39283928
goto out;
39293929
}
39303930
if (GET_SEGNO(fio->sbi, fio->old_blkaddr) != NULL_SEGNO)

0 commit comments

Comments
 (0)