ocfs2: convert ocfs2_map_and_dirty_page() to ocfs2_map_and_dirty_folio()

All callers now have a folio, so skip the folio->page->folio conversion.

Link: https://lkml.kernel.org/r/20241205171653.3179945-19-willy@infradead.org
Signed-off-by: Mark Tinguely <mark.tinguely@oracle.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 0f6ddb534a443937cd83b3a577a2649c90cb377d..88d43fb5bf7d85f62c6a761b39a31640ecea4812 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -6808,11 +6808,10 @@ static int ocfs2_zero_func(handle_t *handle, struct buffer_head *bh)
        return 0;
 }
 
-void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
-                             unsigned int from, unsigned int to,
-                             struct page *page, int zero, u64 *phys)
+void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,
+               size_t from, size_t to, struct folio *folio, int zero,
+               u64 *phys)
 {
-       struct folio *folio = page_folio(page);
        int ret, partial = 0;
        loff_t start_byte = folio_pos(folio) + from;
        loff_t length = to - from;
@@ -6871,8 +6870,8 @@ static void ocfs2_zero_cluster_folios(struct inode *inode, loff_t start,
                BUG_ON(from > PAGE_SIZE);
                BUG_ON(to > PAGE_SIZE);
 
-               ocfs2_map_and_dirty_page(inode, handle, from, to, &folio->page, 1,
-                                        &phys);
+               ocfs2_map_and_dirty_folio(inode, handle, from, to, folio, 1,
+                               &phys);
 
                start = (folio->index + 1) << PAGE_SHIFT;
        }
@@ -7120,7 +7119,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
 
                /*
                 * Save two copies, one for insert, and one that can
-                * be changed by ocfs2_map_and_dirty_page() below.
+                * be changed by ocfs2_map_and_dirty_folio() below.
                 */
                block = phys = ocfs2_clusters_to_blocks(inode->i_sb, bit_off);
 
@@ -7143,8 +7142,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode,
                        goto out_unlock;
                }
 
-               ocfs2_map_and_dirty_page(inode, handle, 0, page_end, &folio->page, 0,
-                                        &phys);
+               ocfs2_map_and_dirty_folio(inode, handle, 0, page_end, folio, 0,
+                               &phys);
        }
 
        spin_lock(&oi->ip_lock);

diff --git a/fs/ocfs2/alloc.h b/fs/ocfs2/alloc.h
index 6a2aca1a062ea3aca7558ecb61cb7f641d40617a..1c0c8336290476df9e434044ccbfa14a3734eefd 100644 (file)
--- a/fs/ocfs2/alloc.h
+++ b/fs/ocfs2/alloc.h
@@ -254,9 +254,9 @@ static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec)
        return !rec->e_leaf_clusters;
 }
 
-void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle,
-                             unsigned int from, unsigned int to,
-                             struct page *page, int zero, u64 *phys);
+void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,
+               size_t from, size_t to, struct folio *folio, int zero,
+               u64 *phys);
 /*
  * Structures which describe a path through a btree, and functions to
  * manipulate them.

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 1d7325d4411f3fa25fa89f78eaf95eacaec53fcd..8f732742b26e36ea3d59b433d7b6380829c09ba3 100644 (file)
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -2975,9 +2975,8 @@ retry:
                        }
                }
 
-               ocfs2_map_and_dirty_page(inode,
-                                        handle, from, to,
-                                        &folio->page, 0, &new_block);
+               ocfs2_map_and_dirty_folio(inode, handle, from, to,
+                               folio, 0, &new_block);
                folio_mark_accessed(folio);
 unlock:
                folio_unlock(folio);