diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2023-02-01 15:50:25 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2023-02-03 11:57:54 +0100 |
| commit | 2a0270ea621b2e1f8f2f193a8d066a46ebaa34f9 (patch) | |
| tree | 011e8695c8775008ce56fd5d0b7e87969dfa7015 | |
| parent | 26bd805cb7b310d8baff4666b24051e402dd2f50 (diff) | |
| download | linux-gfs2-gfs2-mm.tar.gz | |
gfs2: Convert gfs2_page_add_databufs to foliosgfs2-mm
Convert gfs2_page_add_databufs() to folios and rename it to
gfs2_trans_add_databufs().
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
| -rw-r--r-- | fs/gfs2/aops.c | 8 | ||||
| -rw-r--r-- | fs/gfs2/aops.h | 4 | ||||
| -rw-r--r-- | fs/gfs2/bmap.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 2f04c0ff7470bc..2748a82de42a80 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c @@ -37,10 +37,10 @@ #include "aops.h" -void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, - unsigned int from, unsigned int len) +void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio, + unsigned int from, unsigned int len) { - struct buffer_head *head = page_buffers(page); + struct buffer_head *head = folio_buffers(folio); unsigned int bsize = head->b_size; struct buffer_head *bh; unsigned int to = from + len; @@ -134,7 +134,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w create_empty_buffers(page, inode->i_sb->s_blocksize, BIT(BH_Dirty)|BIT(BH_Uptodate)); } - gfs2_page_add_databufs(ip, page, 0, PAGE_SIZE); + gfs2_trans_add_databufs(ip, page_folio(page), 0, PAGE_SIZE); } return gfs2_write_jdata_page(page, wbc); } diff --git a/fs/gfs2/aops.h b/fs/gfs2/aops.h index ff9877a68780da..09db1914425ebb 100644 --- a/fs/gfs2/aops.h +++ b/fs/gfs2/aops.h @@ -9,7 +9,7 @@ #include "incore.h" extern void adjust_fs_space(struct inode *inode); -extern void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page, - unsigned int from, unsigned int len); +extern void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio, + unsigned int from, unsigned int len); #endif /* __AOPS_DOT_H__ */ diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index e191ecfb1fdef4..eedf6926c65249 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -985,8 +985,8 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos, struct gfs2_sbd *sdp = GFS2_SB(inode); if (!gfs2_is_stuffed(ip)) - gfs2_page_add_databufs(ip, &folio->page, offset_in_page(pos), - copied); + gfs2_trans_add_databufs(ip, folio, offset_in_folio(folio, pos), + copied); folio_unlock(folio); folio_put(folio); |