@@ -215,12 +215,12 @@ static inline void count_swpout_vm_event(struct folio *folio)
215
215
}
216
216
217
217
#if defined(CONFIG_MEMCG ) && defined(CONFIG_BLK_CGROUP )
218
- static void bio_associate_blkg_from_page (struct bio * bio , struct page * page )
218
+ static void bio_associate_blkg_from_page (struct bio * bio , struct folio * folio )
219
219
{
220
220
struct cgroup_subsys_state * css ;
221
221
struct mem_cgroup * memcg ;
222
222
223
- memcg = page_memcg ( page );
223
+ memcg = folio_memcg ( folio );
224
224
if (!memcg )
225
225
return ;
226
226
@@ -230,7 +230,7 @@ static void bio_associate_blkg_from_page(struct bio *bio, struct page *page)
230
230
rcu_read_unlock ();
231
231
}
232
232
#else
233
- #define bio_associate_blkg_from_page (bio , page ) do { } while (0)
233
+ #define bio_associate_blkg_from_page (bio , folio ) do { } while (0)
234
234
#endif /* CONFIG_MEMCG && CONFIG_BLK_CGROUP */
235
235
236
236
struct swap_iocb {
@@ -338,7 +338,7 @@ static void swap_writepage_bdev_sync(struct page *page,
338
338
bio .bi_iter .bi_sector = swap_page_sector (page );
339
339
__bio_add_page (& bio , page , thp_size (page ), 0 );
340
340
341
- bio_associate_blkg_from_page (& bio , page );
341
+ bio_associate_blkg_from_page (& bio , folio );
342
342
count_swpout_vm_event (folio );
343
343
344
344
folio_start_writeback (folio );
@@ -361,7 +361,7 @@ static void swap_writepage_bdev_async(struct page *page,
361
361
bio -> bi_end_io = end_swap_bio_write ;
362
362
__bio_add_page (bio , page , thp_size (page ), 0 );
363
363
364
- bio_associate_blkg_from_page (bio , page );
364
+ bio_associate_blkg_from_page (bio , folio );
365
365
count_swpout_vm_event (folio );
366
366
folio_start_writeback (folio );
367
367
folio_unlock (folio );
0 commit comments