MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 18:05:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: convert f2fs_read_multi_pages() to use folio

Browse Source 
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>
Change-Id: I9707bad9f55f3dab40ad4cd294dc8a74798f2aec
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 3981e94285)
This commit is contained in:
Chao Yu 2024-08-14 21:50:59 +08:00 committed by Matthias Männich
parent 05b6e0e2c0
commit 8a40506fc4
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs/f2fs/data.c
View File

@ -2229,19 +2229,22 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,
/* get rid of pages beyond EOF */ /* get rid of pages beyond EOF */
for (i = 0; i < cc->cluster_size; i++) { for (i = 0; i < cc->cluster_size; i++) {
struct page *page = cc->rpages[i]; struct page *page = cc->rpages[i];
struct folio *folio;
if (!page) if (!page)
continue; continue;
if ((sector_t)page->index >= last_block_in_file) {
zero_user_segment(page, 0, PAGE_SIZE); folio = page_folio(page);
if (!PageUptodate(page)) if ((sector_t)folio->index >= last_block_in_file) {
SetPageUptodate(page); folio_zero_segment(folio, 0, folio_size(folio));
} else if (!PageUptodate(page)) { if (!folio_test_uptodate(folio))
folio_mark_uptodate(folio);
} else if (!folio_test_uptodate(folio)) {
continue; continue;
} }
unlock_page(page); folio_unlock(folio);
if (for_write) if (for_write)
put_page(page); folio_put(folio);
cc->rpages[i] = NULL; cc->rpages[i] = NULL;
cc->nr_rpages--; cc->nr_rpages--;
} }
@ -2301,7 +2304,7 @@ skip_reading_dnode:
} }
for (i = 0; i < cc->nr_cpages; i++) { for (i = 0; i < cc->nr_cpages; i++) {
struct page *page = dic->cpages[i]; struct folio *folio = page_folio(dic->cpages[i]);
block_t blkaddr; block_t blkaddr;
struct bio_post_read_ctx *ctx; struct bio_post_read_ctx *ctx;
@ -2311,7 +2314,8 @@ skip_reading_dnode:
f2fs_wait_on_block_writeback(inode, blkaddr); f2fs_wait_on_block_writeback(inode, blkaddr);
if (f2fs_load_compressed_page(sbi, page, blkaddr)) { if (f2fs_load_compressed_page(sbi, folio_page(folio, 0),
blkaddr)) {
if (atomic_dec_and_test(&dic->remaining_pages)) { if (atomic_dec_and_test(&dic->remaining_pages)) {
f2fs_decompress_cluster(dic, true); f2fs_decompress_cluster(dic, true);
break; break;
@ -2321,7 +2325,7 @@ skip_reading_dnode:
if (bio && (!page_is_mergeable(sbi, bio, if (bio && (!page_is_mergeable(sbi, bio,
*last_block_in_bio, blkaddr) || *last_block_in_bio, blkaddr) ||
!f2fs_crypt_mergeable_bio(bio, inode, page->index, NULL))) { !f2fs_crypt_mergeable_bio(bio, inode, folio->index, NULL))) {
submit_and_realloc: submit_and_realloc:
f2fs_submit_read_bio(sbi, bio, DATA); f2fs_submit_read_bio(sbi, bio, DATA);
bio = NULL; bio = NULL;
@ -2330,7 +2334,7 @@ submit_and_realloc:
if (!bio) { if (!bio) {
bio = f2fs_grab_read_bio(inode, blkaddr, nr_pages, bio = f2fs_grab_read_bio(inode, blkaddr, nr_pages,
f2fs_ra_op_flags(rac), f2fs_ra_op_flags(rac),
page->index, for_write); folio->index, for_write);
if (IS_ERR(bio)) { if (IS_ERR(bio)) {
ret = PTR_ERR(bio); ret = PTR_ERR(bio);
f2fs_decompress_end_io(dic, ret, true); f2fs_decompress_end_io(dic, ret, true);
@ -2340,7 +2344,7 @@ submit_and_realloc:
} }
} }
if (bio_add_page(bio, page, blocksize, 0) < blocksize) if (!bio_add_folio(bio, folio, blocksize, 0))
goto submit_and_realloc; goto submit_and_realloc;
ctx = get_post_read_ctx(bio); ctx = get_post_read_ctx(bio);