@@ -98,16 +98,16 @@ void nilfs_forget_buffer(struct buffer_head *bh)
98
98
*/
99
99
void nilfs_copy_buffer (struct buffer_head * dbh , struct buffer_head * sbh )
100
100
{
101
- void * kaddr0 , * kaddr1 ;
101
+ void * saddr , * daddr ;
102
102
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 ;
104
104
struct buffer_head * bh ;
105
105
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 );
111
111
112
112
dbh -> b_state = sbh -> b_state & NILFS_BUFFER_INHERENT_BITS ;
113
113
dbh -> b_blocknr = sbh -> b_blocknr ;
@@ -121,13 +121,13 @@ void nilfs_copy_buffer(struct buffer_head *dbh, struct buffer_head *sbh)
121
121
unlock_buffer (bh );
122
122
}
123
123
if (bits & BIT (BH_Uptodate ))
124
- SetPageUptodate ( dpage );
124
+ folio_mark_uptodate ( dfolio );
125
125
else
126
- ClearPageUptodate ( dpage );
126
+ folio_clear_uptodate ( dfolio );
127
127
if (bits & BIT (BH_Mapped ))
128
- SetPageMappedToDisk ( dpage );
128
+ folio_set_mappedtodisk ( dfolio );
129
129
else
130
- ClearPageMappedToDisk ( dpage );
130
+ folio_clear_mappedtodisk ( dfolio );
131
131
}
132
132
133
133
/**
0 commit comments