btrfs: convert extent_clear_unlock_delalloc() to take a folio

Instead of taking the locked page, take the locked folio so we can pass
that into __process_folios_contig.

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 d73496ce7f52c5d7fc5b2672faf42f3dd6e474fc..a1ba45690635a62365ed242a2c49e747e0de67a8 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -394,14 +394,14 @@ out_failed:
 }
 
 void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
-                                 const struct page *locked_page,
+                                 const struct folio *locked_folio,
                                  struct extent_state **cached,
                                  u32 clear_bits, unsigned long page_ops)
 {
        clear_extent_bit(&inode->io_tree, start, end, clear_bits, cached);
 
-       __process_folios_contig(inode->vfs_inode.i_mapping,
-                               page_folio(locked_page), start, end, page_ops);
+       __process_folios_contig(inode->vfs_inode.i_mapping, locked_folio, start,
+                               end, page_ops);
 }
 
 static bool btrfs_verify_folio(struct folio *folio, u64 start, u32 len)

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 1dd295e1b5a5d78efa0878c5a50bd9ac479eebb9..5d36031578ff9c2f2e19d807b6c093dffa0b48b5 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -354,7 +354,7 @@ void set_extent_buffer_dirty(struct extent_buffer *eb);
 void set_extent_buffer_uptodate(struct extent_buffer *eb);
 void clear_extent_buffer_uptodate(struct extent_buffer *eb);
 void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
-                                 const struct page *locked_page,
+                                 const struct folio *locked_folio,
                                  struct extent_state **cached,
                                  u32 bits_to_clear, unsigned long page_ops);
 int extent_invalidate_folio(struct extent_io_tree *tree,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 26a3d429d9a55d30e8c96a0be80a628e6bf1cfc0..3dff49ba445374fc4c59a363550229486b8443f7 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -743,10 +743,10 @@ static noinline int cow_file_range_inline(struct btrfs_inode *inode,
        if (ret == 0)
                locked_page = NULL;
 
-       extent_clear_unlock_delalloc(inode, offset, end, locked_page, &cached,
-                                    clear_flags,
-                                    PAGE_UNLOCK | PAGE_START_WRITEBACK |
-                                    PAGE_END_WRITEBACK);
+       extent_clear_unlock_delalloc(inode, offset, end,
+                                    page_folio(locked_page), &cached,
+                                    clear_flags, PAGE_UNLOCK |
+                                    PAGE_START_WRITEBACK | PAGE_END_WRITEBACK);
        return ret;
 }
 
@@ -1501,7 +1501,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
                page_ops |= PAGE_SET_ORDERED;
 
                extent_clear_unlock_delalloc(inode, start, start + ram_size - 1,
-                                            locked_page, &cached,
+                                            page_folio(locked_page), &cached,
                                             EXTENT_LOCKED | EXTENT_DELALLOC,
                                             page_ops);
                if (num_bytes < cur_alloc_size)
@@ -1560,7 +1560,8 @@ out_unlock:
                if (!locked_page)
                        mapping_set_error(inode->vfs_inode.i_mapping, ret);
                extent_clear_unlock_delalloc(inode, orig_start, start - 1,
-                                            locked_page, NULL, 0, page_ops);
+                                            page_folio(locked_page), NULL, 0,
+                                            page_ops);
        }
 
        /*
@@ -1583,7 +1584,7 @@ out_unlock:
        if (extent_reserved) {
                extent_clear_unlock_delalloc(inode, start,
                                             start + cur_alloc_size - 1,
-                                            locked_page, &cached,
+                                            page_folio(locked_page), &cached,
                                             clear_bits,
                                             page_ops);
                btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size, NULL);
@@ -1598,8 +1599,9 @@ out_unlock:
         */
        if (start < end) {
                clear_bits |= EXTENT_CLEAR_DATA_RESV;
-               extent_clear_unlock_delalloc(inode, start, end, locked_page,
-                                            &cached, clear_bits, page_ops);
+               extent_clear_unlock_delalloc(inode, start, end,
+                                            page_folio(locked_page), &cached,
+                                            clear_bits, page_ops);
                btrfs_qgroup_free_data(inode, NULL, start, cur_alloc_size, NULL);
        }
        return ret;
@@ -2207,7 +2209,8 @@ must_cow:
                btrfs_put_ordered_extent(ordered);
 
                extent_clear_unlock_delalloc(inode, cur_offset, nocow_end,
-                                            locked_page, &cached_state,
+                                            page_folio(locked_page),
+                                            &cached_state,
                                             EXTENT_LOCKED | EXTENT_DELALLOC |
                                             EXTENT_CLEAR_DATA_RESV,
                                             PAGE_UNLOCK | PAGE_SET_ORDERED);
@@ -2256,7 +2259,7 @@ error:
 
                lock_extent(&inode->io_tree, cur_offset, end, &cached);
                extent_clear_unlock_delalloc(inode, cur_offset, end,
-                                            locked_page, &cached,
+                                            page_folio(locked_page), &cached,
                                             EXTENT_LOCKED | EXTENT_DELALLOC |
                                             EXTENT_DEFRAG |
                                             EXTENT_DO_ACCOUNTING, PAGE_UNLOCK |