Skip to content

Commit a38117b

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
nilfs2: Convert nilfs_copy_buffer() to use folios
Use folio APIs instead of page APIs. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Ryusuke Konishi <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 9c33d85 commit a38117b

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

fs/nilfs2/page.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ void nilfs_forget_buffer(struct buffer_head *bh)
9898
*/
9999
void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)
100100
{
101-
void *kaddr0, *kaddr1;
101+
void *saddr, *daddr;
102102
unsigned long bits;
103-
struct page *spage = sbh->b_page, *dpage = dbh->b_page;
103+
struct folio *sfolio = sbh->b_folio, *dfolio = dbh->b_folio;
104104
struct buffer_head *bh;
105105

106-
kaddr0 = kmap_local_page(spage);
107-
kaddr1 = kmap_local_page(dpage);
108-
memcpy(kaddr1 + bh_offset(dbh), kaddr0 + bh_offset(sbh), sbh->b_size);
109-
kunmap_local(kaddr1);
110-
kunmap_local(kaddr0);
106+
saddr = kmap_local_folio(sfolio, bh_offset(sbh));
107+
daddr = kmap_local_folio(dfolio, bh_offset(dbh));
108+
memcpy(daddr, saddr, sbh->b_size);
109+
kunmap_local(daddr);
110+
kunmap_local(saddr);
111111

112112
dbh->b_state = sbh->b_state & NILFS_BUFFER_INHERENT_BITS;
113113
dbh->b_blocknr = sbh->b_blocknr;
@@ -121,13 +121,13 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)
121121
unlock_buffer(bh);
122122
}
123123
if (bits & BIT(BH_Uptodate))
124-
SetPageUptodate(dpage);
124+
folio_mark_uptodate(dfolio);
125125
else
126-
ClearPageUptodate(dpage);
126+
folio_clear_uptodate(dfolio);
127127
if (bits & BIT(BH_Mapped))
128-
SetPageMappedToDisk(dpage);
128+
folio_set_mappedtodisk(dfolio);
129129
else
130-
ClearPageMappedToDisk(dpage);
130+
folio_clear_mappedtodisk(dfolio);
131131
}
132132

133133
/**

0 commit comments

Comments
 (0)