mm: shrink_inactive_lis() nr_scan accounting fix
Subsystems (3)
PATCH 1/1 mm: shrink_inactive_lis() nr_scan accounting fix
In shrink_inactive_lis(), nr_scan is not accounted when nr_taken is 0. But 0 pages taken does not mean 0 pages scanned.
Move the goto statement below the accounting code to fix it.
Signed-off-by Wu Fengguang <[email protected]>
---
mm/vmscan.c +5 -3
@@ -1132,9 +1132,6 @@ static unsigned long shrink_inactive_lis zone->pages_scanned += nr_scan;spin_unlock_irq (&zone->lru_lock); -if (nr_taken ==0 ) - goto done; - nr_scanned += nr_scan; nr_freed =shrink_page_list (&page_list, sc); nr_reclaimed += nr_freed;
@@ -1146,6 +1143,11 @@ static unsigned long shrink_inactive_lis__mod_page_state_zone (zone, pgscan_direct, nr_scan);__mod_page_state_zone (zone, pgsteal, nr_freed); +if (nr_taken ==0 ) { +local_irq_enable (); + goto done; + } +spin_lock (&zone->lru_lock);/* * Put back any unfreeable pages.