Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: Pass a folio to write_all_xattrs()

Also convert in_page to in_folio. Save five hidden calls to
compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Matthew Wilcox (Oracle) and committed by
Jaegeuk Kim
170c445a b3955efb

+14 -14
+14 -14
fs/f2fs/xattr.c
··· 429 429 } 430 430 431 431 static inline int write_all_xattrs(struct inode *inode, __u32 hsize, 432 - void *txattr_addr, struct page *ipage) 432 + void *txattr_addr, struct folio *ifolio) 433 433 { 434 434 struct f2fs_sb_info *sbi = F2FS_I_SB(inode); 435 435 size_t inline_size = inline_xattr_size(inode); 436 - struct page *in_page = NULL; 436 + struct folio *in_folio = NULL; 437 437 void *xattr_addr; 438 438 void *inline_addr = NULL; 439 439 struct folio *xfolio; ··· 446 446 447 447 /* write to inline xattr */ 448 448 if (inline_size) { 449 - if (ipage) { 450 - inline_addr = inline_xattr_addr(inode, ipage); 449 + if (ifolio) { 450 + inline_addr = inline_xattr_addr(inode, &ifolio->page); 451 451 } else { 452 - in_page = f2fs_get_inode_page(sbi, inode->i_ino); 453 - if (IS_ERR(in_page)) { 452 + in_folio = f2fs_get_inode_folio(sbi, inode->i_ino); 453 + if (IS_ERR(in_folio)) { 454 454 f2fs_alloc_nid_failed(sbi, new_nid); 455 - return PTR_ERR(in_page); 455 + return PTR_ERR(in_folio); 456 456 } 457 - inline_addr = inline_xattr_addr(inode, in_page); 457 + inline_addr = inline_xattr_addr(inode, &in_folio->page); 458 458 } 459 459 460 - f2fs_wait_on_page_writeback(ipage ? ipage : in_page, 460 + f2fs_folio_wait_writeback(ifolio ? ifolio : in_folio, 461 461 NODE, true, true); 462 462 /* no need to use xattr node block */ 463 463 if (hsize <= inline_size) { 464 464 err = f2fs_truncate_xattr_node(inode); 465 465 f2fs_alloc_nid_failed(sbi, new_nid); 466 466 if (err) { 467 - f2fs_put_page(in_page, 1); 467 + f2fs_folio_put(in_folio, true); 468 468 return err; 469 469 } 470 470 memcpy(inline_addr, txattr_addr, inline_size); 471 - set_page_dirty(ipage ? ipage : in_page); 471 + folio_mark_dirty(ifolio ? ifolio : in_folio); 472 472 goto in_page_out; 473 473 } 474 474 } ··· 502 502 memcpy(xattr_addr, txattr_addr + inline_size, VALID_XATTR_BLOCK_SIZE); 503 503 504 504 if (inline_size) 505 - set_page_dirty(ipage ? ipage : in_page); 505 + folio_mark_dirty(ifolio ? ifolio : in_folio); 506 506 folio_mark_dirty(xfolio); 507 507 508 508 f2fs_folio_put(xfolio, true); 509 509 in_page_out: 510 - f2fs_put_page(in_page, 1); 510 + f2fs_folio_put(in_folio, true); 511 511 return err; 512 512 } 513 513 ··· 766 766 *(u32 *)((u8 *)last + newsize) = 0; 767 767 } 768 768 769 - error = write_all_xattrs(inode, new_hsize, base_addr, &ifolio->page); 769 + error = write_all_xattrs(inode, new_hsize, base_addr, ifolio); 770 770 if (error) 771 771 goto exit; 772 772