Commit ad1c3544 authored Mar 31, 2009 by Johannes Weiner Committed by Linus Torvalds Apr 01, 2009

mm: don't free swap slots on page deactivation



The pagevec_swap_free() at the end of shrink_active_list() was introduced
in 68a22394 "vmscan: free swap space on swap-in/activation" when
shrink_active_list() was still rotating referenced active pages.

In 7e9cd484 "vmscan: fix pagecache reclaim referenced bit check" this was
changed, the rotating removed but the pagevec_swap_free() after the
rotation loop was forgotten, applying now to the pagevec of the
deactivation loop instead.

Now swap space is freed for deactivated pages.  And only for those that
happen to be on the pagevec after the deactivation loop.

Complete 7e9cd484 and remove the rest of the swap freeing.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2443462b

mm/vmscan.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1303,9 +1303,6 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
		spin_unlock_irq(&zone->lru_lock);
		if (buffer_heads_over_limit)
		pagevec_strip(&pvec);
		if (vm_swap_full())
		pagevec_swap_free(&pvec);

		pagevec_release(&pvec);
		}

Admin message