Skip to content

Commit 5697e94

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: get rid of page->index
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/[email protected]/ Cc: Matthew Wilcox <[email protected]> Signed-off-by: Chao Yu <[email protected]> Reviewed-by: Li Zetao <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 2eaa98e commit 5697e94

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

fs/f2fs/compress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc)
881881
f2fs_bug_on(F2FS_I_SB(cc->inode), !page);
882882

883883
/* beyond EOF */
884-
if (page->index >= nr_pages)
884+
if (page_folio(page)->index >= nr_pages)
885885
return true;
886886
}
887887
return false;

fs/f2fs/data.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static void f2fs_write_end_io(struct bio *bio)
354354
}
355355

356356
f2fs_bug_on(sbi, page->mapping == NODE_MAPPING(sbi) &&
357-
page->index != nid_of_node(page));
357+
page_folio(page)->index != nid_of_node(page));
358358

359359
dec_page_count(sbi, type);
360360
if (f2fs_in_warm_node_list(sbi, page))
@@ -703,7 +703,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
703703
bio = __bio_alloc(fio, 1);
704704

705705
f2fs_set_bio_crypt_ctx(bio, fio->page->mapping->host,
706-
fio->page->index, fio, GFP_NOIO);
706+
page_folio(fio->page)->index, fio, GFP_NOIO);
707707

708708
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
709709
bio_put(bio);
@@ -802,7 +802,7 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,
802802
fio->new_blkaddr));
803803
if (f2fs_crypt_mergeable_bio(*bio,
804804
fio->page->mapping->host,
805-
fio->page->index, fio) &&
805+
page_folio(fio->page)->index, fio) &&
806806
bio_add_page(*bio, page, PAGE_SIZE, 0) ==
807807
PAGE_SIZE) {
808808
ret = 0;
@@ -902,7 +902,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
902902
if (!bio) {
903903
bio = __bio_alloc(fio, BIO_MAX_VECS);
904904
f2fs_set_bio_crypt_ctx(bio, fio->page->mapping->host,
905-
fio->page->index, fio, GFP_NOIO);
905+
page_folio(fio->page)->index, fio, GFP_NOIO);
906906

907907
add_bio_entry(fio->sbi, bio, page, fio->temp);
908908
} else {
@@ -995,13 +995,13 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
995995
(!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio,
996996
fio->new_blkaddr) ||
997997
!f2fs_crypt_mergeable_bio(io->bio, fio->page->mapping->host,
998-
bio_page->index, fio)))
998+
page_folio(bio_page)->index, fio)))
999999
__submit_merged_bio(io);
10001000
alloc_new:
10011001
if (io->bio == NULL) {
10021002
io->bio = __bio_alloc(fio, BIO_MAX_VECS);
10031003
f2fs_set_bio_crypt_ctx(io->bio, fio->page->mapping->host,
1004-
bio_page->index, fio, GFP_NOIO);
1004+
page_folio(bio_page)->index, fio, GFP_NOIO);
10051005
io->fio = *fio;
10061006
}
10071007

fs/f2fs/dir.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
842842
struct f2fs_dentry_block *dentry_blk;
843843
unsigned int bit_pos;
844844
int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));
845+
pgoff_t index = page_folio(page)->index;
845846
int i;
846847

847848
f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);
@@ -867,7 +868,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
867868
set_page_dirty(page);
868869

869870
if (bit_pos == NR_DENTRY_IN_BLOCK &&
870-
!f2fs_truncate_hole(dir, page->index, page->index + 1)) {
871+
!f2fs_truncate_hole(dir, index, index + 1)) {
871872
f2fs_clear_page_cache_dirty_tag(page_folio(page));
872873
clear_page_dirty_for_io(page);
873874
ClearPageUptodate(page);

fs/f2fs/inode.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)
174174

175175
if (provided != calculated)
176176
f2fs_warn(sbi, "checksum invalid, nid = %lu, ino_of_node = %x, %x vs. %x",
177-
page->index, ino_of_node(page), provided, calculated);
177+
page_folio(page)->index, ino_of_node(page),
178+
provided, calculated);
178179

179180
return provided == calculated;
180181
}

fs/f2fs/node.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -919,7 +919,7 @@ static int truncate_node(struct dnode_of_data *dn)
919919
clear_node_page_dirty(dn->node_page);
920920
set_sbi_flag(sbi, SBI_IS_DIRTY);
921921

922-
index = dn->node_page->index;
922+
index = page_folio(dn->node_page)->index;
923923
f2fs_put_page(dn->node_page, 1);
924924

925925
invalidate_mapping_pages(NODE_MAPPING(sbi),
@@ -1869,7 +1869,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
18691869
}
18701870
if (!ret && atomic && !marked) {
18711871
f2fs_debug(sbi, "Retry to write fsync mark: ino=%u, idx=%lx",
1872-
ino, last_page->index);
1872+
ino, page_folio(last_page)->index);
18731873
lock_page(last_page);
18741874
f2fs_wait_on_page_writeback(last_page, NODE, true, true);
18751875
set_page_dirty(last_page);

fs/f2fs/segment.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3552,7 +3552,8 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)
35523552
if (file_is_cold(inode) || f2fs_need_compress_data(inode))
35533553
return CURSEG_COLD_DATA;
35543554

3555-
type = __get_age_segment_type(inode, fio->page->index);
3555+
type = __get_age_segment_type(inode,
3556+
page_folio(fio->page)->index);
35563557
if (type != NO_CHECK_TYPE)
35573558
return type;
35583559

0 commit comments

Comments
 (0)