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>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 85a28becd3f9ebbd09150c69d8161f8a519ee148..cf2022ea2d82e9adaa0c066ac691e8b38ba72118 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -472,8 +472,8 @@ static void end_bbio_data_write(struct btrfs_bio *bbio)
                "incomplete page write with offset %zu and length %zu",
                                   fi.offset, fi.length);
 
-               btrfs_finish_ordered_extent(bbio->ordered,
-                               folio_page(folio, 0), start, len, !error);
+               btrfs_finish_ordered_extent(bbio->ordered, folio, start, len,
+                                           !error);
                if (error)
                        mapping_set_error(folio->mapping, error);
                btrfs_folio_clear_writeback(fs_info, folio, start, len);

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 760a37512c7e0867f2fc82e87119b07aea707dab..e97747956040961d87ded6d28011282a82fd7eb6 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -397,7 +397,7 @@ static void btrfs_queue_ordered_fn(struct btrfs_ordered_extent *ordered)
 }
 
 void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
-                                struct page *page, u64 file_offset, u64 len,
+                                struct folio *folio, u64 file_offset, u64 len,
                                 bool uptodate)
 {
        struct btrfs_inode *inode = ordered->inode;
@@ -407,8 +407,8 @@ void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
        trace_btrfs_finish_ordered_extent(inode, file_offset, len, uptodate);
 
        spin_lock_irqsave(&inode->ordered_tree_lock, flags);
-       ret = can_finish_ordered_extent(ordered, page_folio(page), file_offset,
-                                       len, uptodate);
+       ret = can_finish_ordered_extent(ordered, folio, file_offset, len,
+                                       uptodate);
        spin_unlock_irqrestore(&inode->ordered_tree_lock, flags);
 
        /*

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 51b9e81726e220deb20ab76609146c7a81fc428e..90c1c3c51ae5723d3b999bcb105e02a604ef596c 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -163,7 +163,7 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry);
 void btrfs_remove_ordered_extent(struct btrfs_inode *btrfs_inode,
                                struct btrfs_ordered_extent *entry);
 void btrfs_finish_ordered_extent(struct btrfs_ordered_extent *ordered,
-                                struct page *page, u64 file_offset, u64 len,
+                                struct folio *folio, u64 file_offset, u64 len,
                                 bool uptodate);
 void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode,
                                struct page *page, u64 file_offset,