[f2fs-dev] [PATCH 06/14] btrfs: convert submit_eb_subpage() to take a folio

[Li Zetao via Linux-f2fs-devel]

The old page API is being gradually replaced and converted to use folio
to improve code readability and avoid repeated conversion between page
and folio. Moreover, use folio_pos() instend of page_offset(),
which is more consistent with folio usage.

Signed-off-by: Li Zetao <lizet...@huawei.com>
---
 fs/btrfs/extent_io.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a0102b9b67ff..ca458237ac35 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1818,12 +1818,11 @@ static noinline_for_stack void write_one_eb(struct 
extent_buffer *eb,
  * Return >=0 for the number of submitted extent buffers.
  * Return <0 for fatal error.
  */
-static int submit_eb_subpage(struct page *page, struct writeback_control *wbc)
+static int submit_eb_subpage(struct folio *folio, struct writeback_control 
*wbc)
 {
-       struct btrfs_fs_info *fs_info = page_to_fs_info(page);
-       struct folio *folio = page_folio(page);
+       struct btrfs_fs_info *fs_info = folio_to_fs_info(folio);
        int submitted = 0;
-       u64 page_start = page_offset(page);
+       u64 folio_start = folio_pos(folio);
        int bit_start = 0;
        int sectors_per_node = fs_info->nodesize >> fs_info->sectorsize_bits;
 
@@ -1838,21 +1837,21 @@ static int submit_eb_subpage(struct page *page, struct 
writeback_control *wbc)
                 * Take private lock to ensure the subpage won't be detached
                 * in the meantime.
                 */
-               spin_lock(&page->mapping->i_private_lock);
+               spin_lock(&folio->mapping->i_private_lock);
                if (!folio_test_private(folio)) {
-                       spin_unlock(&page->mapping->i_private_lock);
+                       spin_unlock(&folio->mapping->i_private_lock);
                        break;
                }
                spin_lock_irqsave(&subpage->lock, flags);
                if (!test_bit(bit_start + fs_info->subpage_info->dirty_offset,
                              subpage->bitmaps)) {
                        spin_unlock_irqrestore(&subpage->lock, flags);
-                       spin_unlock(&page->mapping->i_private_lock);
+                       spin_unlock(&folio->mapping->i_private_lock);
                        bit_start++;
                        continue;
                }
 
-               start = page_start + bit_start * fs_info->sectorsize;
+               start = folio_start + bit_start * fs_info->sectorsize;
                bit_start += sectors_per_node;
 
                /*
@@ -1861,7 +1860,7 @@ static int submit_eb_subpage(struct page *page, struct 
writeback_control *wbc)
                 */
                eb = find_extent_buffer_nolock(fs_info, start);
                spin_unlock_irqrestore(&subpage->lock, flags);
-               spin_unlock(&page->mapping->i_private_lock);
+               spin_unlock(&folio->mapping->i_private_lock);
 
                /*
                 * The eb has already reached 0 refs thus find_extent_buffer()
@@ -1912,7 +1911,7 @@ static int submit_eb_page(struct page *page, struct 
btrfs_eb_write_context *ctx)
                return 0;
 
        if (page_to_fs_info(page)->nodesize < PAGE_SIZE)
-               return submit_eb_subpage(page, wbc);
+               return submit_eb_subpage(folio, wbc);
 
        spin_lock(&mapping->i_private_lock);
        if (!folio_test_private(folio)) {
-- 
2.34.1



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel