@@ -205,13 +205,13 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
205
205
return 0 ;
206
206
}
207
207
208
- static inline void count_swpout_vm_event (struct page * page )
208
+ static inline void count_swpout_vm_event (struct folio * folio )
209
209
{
210
210
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
211
- if (unlikely (PageTransHuge ( page )))
211
+ if (unlikely (folio_test_pmd_mappable ( folio )))
212
212
count_vm_event (THP_SWPOUT );
213
213
#endif
214
- count_vm_events (PSWPOUT , thp_nr_pages ( page ));
214
+ count_vm_events (PSWPOUT , folio_nr_pages ( folio ));
215
215
}
216
216
217
217
#if defined(CONFIG_MEMCG ) && defined(CONFIG_BLK_CGROUP )
@@ -280,7 +280,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret)
280
280
}
281
281
} else {
282
282
for (p = 0 ; p < sio -> pages ; p ++ )
283
- count_swpout_vm_event (sio -> bvec [p ].bv_page );
283
+ count_swpout_vm_event (page_folio ( sio -> bvec [p ].bv_page ) );
284
284
}
285
285
286
286
for (p = 0 ; p < sio -> pages ; p ++ )
@@ -339,7 +339,7 @@ static void swap_writepage_bdev_sync(struct page *page,
339
339
__bio_add_page (& bio , page , thp_size (page ), 0 );
340
340
341
341
bio_associate_blkg_from_page (& bio , page );
342
- count_swpout_vm_event (page );
342
+ count_swpout_vm_event (folio );
343
343
344
344
folio_start_writeback (folio );
345
345
folio_unlock (folio );
@@ -362,7 +362,7 @@ static void swap_writepage_bdev_async(struct page *page,
362
362
__bio_add_page (bio , page , thp_size (page ), 0 );
363
363
364
364
bio_associate_blkg_from_page (bio , page );
365
- count_swpout_vm_event (page );
365
+ count_swpout_vm_event (folio );
366
366
folio_start_writeback (folio );
367
367
folio_unlock (folio );
368
368
submit_bio (bio );
0 commit comments