Commit fe15ec04 authored by Kairui Song's avatar Kairui Song Committed by Andrew Morton
Browse files

f2fs: drop usage of folio_index 

folio_index is only needed for mixed usage of page cache and swap cache,
for pure page cache usage, the caller can just use folio->index instead.

It can't be a swap cache folio here.  Swap mapping may only call into fs
through `swap_rw` but f2fs does not use that method for swap.

Link: https://lkml.kernel.org/r/20250430181052.55698-4-ryncsn@gmail.com


Signed-off-by: default avatarKairui Song <kasong@tencent.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Chris Li <chrisl@kernel.org>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Sterba <dsterba@suse.com>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Joanne Koong <joannelkoong@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Qu Wenruo <wqu@suse.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 74e6ee62

fs/f2fs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -2077,7 +2077,7 @@ static int f2fs_read_single_page(struct inode *inode, struct folio *folio, 
	sector_t last_block;

	sector_t last_block_in_file;

	sector_t block_nr;

	pgoff_t index = folio_index(folio);

	pgoff_t index = folio->index;

	int ret = 0;



	block_in_file = (sector_t)index;
@@ -2392,7 +2392,7 @@ static int f2fs_mpage_readpages(struct inode *inode, 
		}



#ifdef CONFIG_F2FS_FS_COMPRESSION

		index = folio_index(folio);

		index = folio->index;



		if (!f2fs_compressed_file(inode))

			goto read_single_page;

fs/f2fs/inline.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage) 
	if (folio_test_uptodate(folio))

		return;



	f2fs_bug_on(F2FS_I_SB(inode), folio_index(folio));

	f2fs_bug_on(F2FS_I_SB(inode), folio->index);



	folio_zero_segment(folio, MAX_INLINE_DATA(inode), folio_size(folio));
@@ -130,7 +130,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio) 
		return -EAGAIN;

	}



	if (folio_index(folio))

	if (folio->index)

		folio_zero_segment(folio, 0, folio_size(folio));

	else

		f2fs_do_read_inline_data(folio, ipage);

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3432,7 +3432,7 @@ static int __f2fs_commit_super(struct f2fs_sb_info *sbi, struct folio *folio, 
	bio = bio_alloc(sbi->sb->s_bdev, 1, opf, GFP_NOFS);



	/* it doesn't need to set crypto context for superblock update */

	bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio_index(folio));

	bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(folio->index);



	if (!bio_add_folio(bio, folio, folio_size(folio), 0))

		f2fs_bug_on(sbi, 1);