|
@@ -179,26 +179,26 @@ static void pagevec_lru_move_fn(struct pagevec *pvec,
|
|
|
void *arg)
|
|
|
{
|
|
|
int i;
|
|
|
- struct zone *zone = NULL;
|
|
|
+ struct pglist_data *pgdat = NULL;
|
|
|
struct lruvec *lruvec;
|
|
|
unsigned long flags = 0;
|
|
|
|
|
|
for (i = 0; i < pagevec_count(pvec); i++) {
|
|
|
struct page *page = pvec->pages[i];
|
|
|
- struct zone *pagezone = page_zone(page);
|
|
|
+ struct pglist_data *pagepgdat = page_pgdat(page);
|
|
|
|
|
|
- if (pagezone != zone) {
|
|
|
- if (zone)
|
|
|
- spin_unlock_irqrestore(zone_lru_lock(zone), flags);
|
|
|
- zone = pagezone;
|
|
|
- spin_lock_irqsave(zone_lru_lock(zone), flags);
|
|
|
+ if (pagepgdat != pgdat) {
|
|
|
+ if (pgdat)
|
|
|
+ spin_unlock_irqrestore(&pgdat->lru_lock, flags);
|
|
|
+ pgdat = pagepgdat;
|
|
|
+ spin_lock_irqsave(&pgdat->lru_lock, flags);
|
|
|
}
|
|
|
|
|
|
- lruvec = mem_cgroup_page_lruvec(page, zone->zone_pgdat);
|
|
|
+ lruvec = mem_cgroup_page_lruvec(page, pgdat);
|
|
|
(*move_fn)(page, lruvec, arg);
|
|
|
}
|
|
|
- if (zone)
|
|
|
- spin_unlock_irqrestore(zone_lru_lock(zone), flags);
|
|
|
+ if (pgdat)
|
|
|
+ spin_unlock_irqrestore(&pgdat->lru_lock, flags);
|
|
|
release_pages(pvec->pages, pvec->nr, pvec->cold);
|
|
|
pagevec_reinit(pvec);
|
|
|
}
|