Commit 5697e94d authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

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/Zp8fgUSIBGQ1TN0D@casper.infradead.org/



Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Reviewed-by: default avatarLi Zetao <lizetao1@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2eaa98e5

fs/f2fs/compress.c

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ static bool cluster_has_invalid_data(struct compress_ctx *cc) 
		f2fs_bug_on(F2FS_I_SB(cc->inode), !page);



		/* beyond EOF */

		if (page->index >= nr_pages)

		if (page_folio(page)->index >= nr_pages)

			return true;

	}

	return false;

fs/f2fs/data.c

+6 −6
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static void f2fs_write_end_io(struct bio *bio) 
		}



		f2fs_bug_on(sbi, page->mapping == NODE_MAPPING(sbi) &&

					page->index != nid_of_node(page));

				page_folio(page)->index != nid_of_node(page));



		dec_page_count(sbi, type);

		if (f2fs_in_warm_node_list(sbi, page))
@@ -703,7 +703,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 
	bio = __bio_alloc(fio, 1);



	f2fs_set_bio_crypt_ctx(bio, fio->page->mapping->host,

			       fio->page->index, fio, GFP_NOIO);

			page_folio(fio->page)->index, fio, GFP_NOIO);



	if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {

		bio_put(bio);
@@ -802,7 +802,7 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio, 
							    fio->new_blkaddr));

			if (f2fs_crypt_mergeable_bio(*bio,

					fio->page->mapping->host,

					fio->page->index, fio) &&

					page_folio(fio->page)->index, fio) &&

			    bio_add_page(*bio, page, PAGE_SIZE, 0) ==

					PAGE_SIZE) {

				ret = 0;
@@ -902,7 +902,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) 
	if (!bio) {

		bio = __bio_alloc(fio, BIO_MAX_VECS);

		f2fs_set_bio_crypt_ctx(bio, fio->page->mapping->host,

				       fio->page->index, fio, GFP_NOIO);

				page_folio(fio->page)->index, fio, GFP_NOIO);



		add_bio_entry(fio->sbi, bio, page, fio->temp);

	} else {
@@ -995,13 +995,13 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
	    (!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio,

			      fio->new_blkaddr) ||

	     !f2fs_crypt_mergeable_bio(io->bio, fio->page->mapping->host,

				       bio_page->index, fio)))

				page_folio(bio_page)->index, fio)))

		__submit_merged_bio(io);

alloc_new:

	if (io->bio == NULL) {

		io->bio = __bio_alloc(fio, BIO_MAX_VECS);

		f2fs_set_bio_crypt_ctx(io->bio, fio->page->mapping->host,

				       bio_page->index, fio, GFP_NOIO);

				page_folio(bio_page)->index, fio, GFP_NOIO);

		io->fio = *fio;

	}

fs/f2fs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -842,6 +842,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 
	struct	f2fs_dentry_block *dentry_blk;

	unsigned int bit_pos;

	int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));

	pgoff_t index = page_folio(page)->index;

	int i;



	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, 
	set_page_dirty(page);



	if (bit_pos == NR_DENTRY_IN_BLOCK &&

		!f2fs_truncate_hole(dir, page->index, page->index + 1)) {

		!f2fs_truncate_hole(dir, index, index + 1)) {

		f2fs_clear_page_cache_dirty_tag(page_folio(page));

		clear_page_dirty_for_io(page);

		ClearPageUptodate(page);

fs/f2fs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page) 


	if (provided != calculated)

		f2fs_warn(sbi, "checksum invalid, nid = %lu, ino_of_node = %x, %x vs. %x",

			  page->index, ino_of_node(page), provided, calculated);

			  page_folio(page)->index, ino_of_node(page),

			  provided, calculated);



	return provided == calculated;

}

fs/f2fs/node.c

+2 −2
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static int truncate_node(struct dnode_of_data *dn) 
	clear_node_page_dirty(dn->node_page);

	set_sbi_flag(sbi, SBI_IS_DIRTY);



	index = dn->node_page->index;

	index = page_folio(dn->node_page)->index;

	f2fs_put_page(dn->node_page, 1);



	invalidate_mapping_pages(NODE_MAPPING(sbi),
@@ -1869,7 +1869,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, 
	}

	if (!ret && atomic && !marked) {

		f2fs_debug(sbi, "Retry to write fsync mark: ino=%u, idx=%lx",

			   ino, last_page->index);

			   ino, page_folio(last_page)->index);

		lock_page(last_page);

		f2fs_wait_on_page_writeback(last_page, NODE, true, true);

		set_page_dirty(last_page);