Commit 763a0dc7 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: convert f2fs_handle_page_eio() to use folio 

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>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 3981e942

fs/f2fs/checkpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, 
	}



	if (unlikely(!PageUptodate(page))) {

		f2fs_handle_page_eio(sbi, page->index, META);

		f2fs_handle_page_eio(sbi, page_folio(page), META);

		f2fs_put_page(page, 1);

		return ERR_PTR(-EIO);

	}

fs/f2fs/f2fs.h

+4 −2
Original line number Diff line number Diff line
@@ -4678,9 +4678,11 @@ static inline void f2fs_io_schedule_timeout(long timeout) 
	io_schedule_timeout(timeout);

}



static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi, pgoff_t ofs,

					enum page_type type)

static inline void f2fs_handle_page_eio(struct f2fs_sb_info *sbi,

				struct folio *folio, enum page_type type)

{

	pgoff_t ofs = folio->index;



	if (unlikely(f2fs_cp_error(sbi)))

		return;

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ static struct page *__get_node_page(struct f2fs_sb_info *sbi, pgoff_t nid, 
out_put_err:

	/* ENOENT comes from read_node_page which is not an error. */

	if (err != -ENOENT)

		f2fs_handle_page_eio(sbi, page->index, NODE);

		f2fs_handle_page_eio(sbi, page_folio(page), NODE);

	f2fs_put_page(page, 1);

	return ERR_PTR(err);

}