forked from luck/tmp_suning_uos_patched
[PATCH] mm: shrink_inactive_lis() nr_scan accounting fix
In shrink_inactive_list(), 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 <wfg@mail.ustc.edu.cn> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
c9b02d970c
commit
fb8d14e172
|
@ -1132,9 +1132,6 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
|
|||
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,9 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
|
|||
__mod_page_state_zone(zone, pgscan_direct, nr_scan);
|
||||
__mod_page_state_zone(zone, pgsteal, nr_freed);
|
||||
|
||||
if (nr_taken == 0)
|
||||
goto done;
|
||||
|
||||
spin_lock(&zone->lru_lock);
|
||||
/*
|
||||
* Put back any unfreeable pages.
|
||||
|
@ -1166,8 +1166,9 @@ static unsigned long shrink_inactive_list(unsigned long max_scan,
|
|||
}
|
||||
}
|
||||
} while (nr_scanned < max_scan);
|
||||
spin_unlock_irq(&zone->lru_lock);
|
||||
spin_unlock(&zone->lru_lock);
|
||||
done:
|
||||
local_irq_enable();
|
||||
pagevec_release(&pvec);
|
||||
return nr_reclaimed;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user