Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757082Ab3DXBmH (ORCPT ); Tue, 23 Apr 2013 21:42:07 -0400 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:54798 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754902Ab3DXBlj (ORCPT ); Tue, 23 Apr 2013 21:41:39 -0400 X-AuditID: 9c93016f-b7b70ae0000038d5-71-5177384f2d2d From: Minchan Kim To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Michael Kerrisk , Rik van Riel , Dave Hansen , Minchan Kim Subject: [PATCH v2 3/6] mm: Remove shrink_page Date: Wed, 24 Apr 2013 10:41:01 +0900 Message-Id: <1366767664-17541-4-git-send-email-minchan@kernel.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1366767664-17541-1-git-send-email-minchan@kernel.org> References: <1366767664-17541-1-git-send-email-minchan@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2689 Lines: 94 By previous patch, shrink_page_list can handle pages from multiple zone so let's remove shrink_page. Signed-off-by: Minchan Kim --- mm/vmscan.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 82f4d6c..42af075 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -924,6 +924,13 @@ free_it: * appear not as the counts should be low */ list_add(&page->lru, &free_pages); + /* + * If pagelist are from multiple zones, we should decrease + * NR_ISOLATED_ANON + x on freed pages in here. + */ + if (!zone) + dec_zone_page_state(page, NR_ISOLATED_ANON + + page_is_file_cache(page)); continue; cull_mlocked: @@ -994,28 +1001,6 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone, } #ifdef CONFIG_PROCESS_RECLAIM -static unsigned long shrink_page(struct page *page, - struct zone *zone, - struct scan_control *sc, - enum ttu_flags ttu_flags, - unsigned long *ret_nr_dirty, - unsigned long *ret_nr_writeback, - bool force_reclaim, - struct list_head *ret_pages) -{ - int reclaimed; - LIST_HEAD(page_list); - list_add(&page->lru, &page_list); - - reclaimed = shrink_page_list(&page_list, zone, sc, ttu_flags, - ret_nr_dirty, ret_nr_writeback, - force_reclaim); - if (!reclaimed) - list_splice(&page_list, ret_pages); - - return reclaimed; -} - unsigned long reclaim_pages_from_list(struct list_head *page_list) { struct scan_control sc = { @@ -1025,23 +1010,19 @@ unsigned long reclaim_pages_from_list(struct list_head *page_list) .may_swap = 1, }; - LIST_HEAD(ret_pages); + unsigned long nr_reclaimed; struct page *page; unsigned long dummy1, dummy2; - unsigned long nr_reclaimed = 0; - - while (!list_empty(page_list)) { - page = lru_to_page(page_list); - list_del(&page->lru); + list_for_each_entry(page, page_list, lru) ClearPageActive(page); - nr_reclaimed += shrink_page(page, page_zone(page), &sc, + + nr_reclaimed = shrink_page_list(page_list, NULL, &sc, TTU_UNMAP|TTU_IGNORE_ACCESS, - &dummy1, &dummy2, true, &ret_pages); - } + &dummy1, &dummy2, true); - while (!list_empty(&ret_pages)) { - page = lru_to_page(&ret_pages); + while (!list_empty(page_list)) { + page = lru_to_page(page_list); list_del(&page->lru); dec_zone_page_state(page, NR_ISOLATED_ANON + page_is_file_cache(page)); -- 1.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/