Skip to content

Commit c1b0c3c

Browse files
author
Andreas Gruenbacher
committed
gfs2: Convert gfs2_page_add_databufs to folios
Convert gfs2_page_add_databufs() to folios and rename it to gfs2_trans_add_databufs(). Cc: Matthew Wilcox <[email protected]> Signed-off-by: Andreas Gruenbacher <[email protected]>
1 parent cbb6095 commit c1b0c3c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

fs/gfs2/aops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
#include "aops.h"
3838

3939

40-
void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
41-
unsigned int from, unsigned int len)
40+
void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,
41+
unsigned int from, unsigned int len)
4242
{
43-
struct buffer_head *head = page_buffers(page);
43+
struct buffer_head *head = folio_buffers(folio);
4444
unsigned int bsize = head->b_size;
4545
struct buffer_head *bh;
4646
unsigned int to = from + len;
@@ -134,7 +134,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w
134134
create_empty_buffers(page, inode->i_sb->s_blocksize,
135135
BIT(BH_Dirty)|BIT(BH_Uptodate));
136136
}
137-
gfs2_page_add_databufs(ip, page, 0, PAGE_SIZE);
137+
gfs2_trans_add_databufs(ip, page_folio(page), 0, PAGE_SIZE);
138138
}
139139
return gfs2_write_jdata_page(page, wbc);
140140
}

fs/gfs2/aops.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "incore.h"
1010

1111
extern void adjust_fs_space(struct inode *inode);
12-
extern void gfs2_page_add_databufs(struct gfs2_inode *ip, struct page *page,
13-
unsigned int from, unsigned int len);
12+
extern void gfs2_trans_add_databufs(struct gfs2_inode *ip, struct folio *folio,
13+
unsigned int from, unsigned int len);
1414

1515
#endif /* __AOPS_DOT_H__ */

fs/gfs2/bmap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -985,8 +985,8 @@ static void gfs2_iomap_put_folio(struct inode *inode, loff_t pos,
985985
struct gfs2_sbd *sdp = GFS2_SB(inode);
986986

987987
if (!gfs2_is_stuffed(ip))
988-
gfs2_page_add_databufs(ip, &folio->page, offset_in_page(pos),
989-
copied);
988+
gfs2_trans_add_databufs(ip, folio, offset_in_folio(folio, pos),
989+
copied);
990990

991991
folio_unlock(folio);
992992
folio_put(folio);

0 commit comments

Comments
 (0)