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

btrfs: convert btrfs_finish_ordered_extent() to take a folio

The callers and callee's of this now all use folios, update it to take a
folio as well.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Josef Bacik and committed by
David Sterba
aef665d6 0a577636

+6 -6
+2 -2
fs/btrfs/extent_io.c
··· 472 472 "incomplete page write with offset %zu and length %zu", 473 473 fi.offset, fi.length); 474 474 475 - btrfs_finish_ordered_extent(bbio->ordered, 476 - folio_page(folio, 0), start, len, !error); 475 + btrfs_finish_ordered_extent(bbio->ordered, folio, start, len, 476 + !error); 477 477 if (error) 478 478 mapping_set_error(folio->mapping, error); 479 479 btrfs_folio_clear_writeback(fs_info, folio, start, len);
+3 -3
fs/btrfs/ordered-data.c
··· 397 397 } 398 398 399 399 void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered, 400 - struct page *page, u64 file_offset, u64 len, 400 + struct folio *folio, u64 file_offset, u64 len, 401 401 bool uptodate) 402 402 { 403 403 struct btrfs_inode *inode = ordered->inode; ··· 407 407 trace_btrfs_finish_ordered_extent(inode, file_offset, len, uptodate); 408 408 409 409 spin_lock_irqsave(&inode->ordered_tree_lock, flags); 410 - ret = can_finish_ordered_extent(ordered, page_folio(page), file_offset, 411 - len, uptodate); 410 + ret = can_finish_ordered_extent(ordered, folio, file_offset, len, 411 + uptodate); 412 412 spin_unlock_irqrestore(&inode->ordered_tree_lock, flags); 413 413 414 414 /*
+1 -1
fs/btrfs/ordered-data.h
··· 163 163 void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode, 164 164 struct btrfs_ordered_extent *entry); 165 165 void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered, 166 - struct page *page, u64 file_offset, u64 len, 166 + struct folio *folio, u64 file_offset, u64 len, 167 167 bool uptodate); 168 168 void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, 169 169 struct page *page, u64 file_offset,