Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mark Tinguely 2024-12-05 17:16:46 +00:00 committed by Andrew Morton
parent 395ea2ab46
commit 602f206a7c
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ocfs2/alloc.c
View File

@ -6808,11 +6808,10 @@ static int ocfs2_zero_func(handle_t *handle, struct buffer_head *bh)
return 0; return 0;
} }
void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle, void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,
unsigned int from, unsigned int to, size_t from, size_t to, struct folio *folio, int zero,
struct page *page, int zero, u64 *phys) u64 *phys)
{ {
struct folio *folio = page_folio(page);
int ret, partial = 0; int ret, partial = 0;
loff_t start_byte = folio_pos(folio) + from; loff_t start_byte = folio_pos(folio) + from;
loff_t length = to - 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(from > PAGE_SIZE);
BUG_ON(to > PAGE_SIZE); BUG_ON(to > PAGE_SIZE);
ocfs2_map_and_dirty_page(inode, handle, from, to, &folio->page, 1, ocfs2_map_and_dirty_folio(inode, handle, from, to, folio, 1,
&phys); &phys);
start = (folio->index + 1) << PAGE_SHIFT; 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 * 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); 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; goto out_unlock;
} }
ocfs2_map_and_dirty_page(inode, handle, 0, page_end, &folio->page, 0, ocfs2_map_and_dirty_folio(inode, handle, 0, page_end, folio, 0,
&phys); &phys);
} }
spin_lock(&oi->ip_lock); spin_lock(&oi->ip_lock);

6
fs/ocfs2/alloc.h
View File

@ -254,9 +254,9 @@ static inline int ocfs2_is_empty_extent(struct ocfs2_extent_rec *rec)
return !rec->e_leaf_clusters; return !rec->e_leaf_clusters;
} }
void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle, void ocfs2_map_and_dirty_folio(struct inode *inode, handle_t *handle,
unsigned int from, unsigned int to, size_t from, size_t to, struct folio *folio, int zero,
struct page *page, int zero, u64 *phys); u64 *phys);
/* /*
* Structures which describe a path through a btree, and functions to * Structures which describe a path through a btree, and functions to
* manipulate them. * manipulate them.

5
fs/ocfs2/refcounttree.c
View File

@ -2975,9 +2975,8 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
} }
} }
ocfs2_map_and_dirty_page(inode, ocfs2_map_and_dirty_folio(inode, handle, from, to,
handle, from, to, folio, 0, &new_block);
&folio->page, 0, &new_block);
folio_mark_accessed(folio); folio_mark_accessed(folio);
unlock: unlock:
folio_unlock(folio); folio_unlock(folio);