Skip to content

Commit ac86690

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Use a folio in f2fs_write_compressed_pages()
Remove accesses to page->index and an unnecessary reference to page->mapping. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 1cda5bc commit ac86690

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

fs/f2fs/compress.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
12821282
.encrypted = fscrypt_inode_uses_fs_layer_crypto(cc->inode) ?
12831283
1 : 0,
12841284
};
1285+
struct folio *folio;
12851286
struct dnode_of_data dn;
12861287
struct node_info ni;
12871288
struct compress_io_ctx *cic;
@@ -1293,7 +1294,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
12931294

12941295
/* we should bypass data pages to proceed the kworker jobs */
12951296
if (unlikely(f2fs_cp_error(sbi))) {
1296-
mapping_set_error(cc->rpages[0]->mapping, -EIO);
1297+
mapping_set_error(inode->i_mapping, -EIO);
12971298
goto out_free;
12981299
}
12991300

@@ -1320,7 +1321,8 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
13201321
goto out_put_dnode;
13211322
}
13221323

1323-
psize = (loff_t)(cc->rpages[last_index]->index + 1) << PAGE_SHIFT;
1324+
folio = page_folio(cc->rpages[last_index]);
1325+
psize = folio_pos(folio) + folio_size(folio);
13241326

13251327
err = f2fs_get_node_info(fio.sbi, dn.nid, &ni, false);
13261328
if (err)
@@ -1343,7 +1345,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
13431345

13441346
for (i = 0; i < cc->valid_nr_cpages; i++) {
13451347
f2fs_set_compressed_page(cc->cpages[i], inode,
1346-
cc->rpages[i + 1]->index, cic);
1348+
page_folio(cc->rpages[i + 1])->index, cic);
13471349
fio.compressed_page = cc->cpages[i];
13481350

13491351
fio.old_blkaddr = data_blkaddr(dn.inode, dn.node_page,

0 commit comments

Comments
 (0)