Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932130AbVLAKPR (ORCPT ); Thu, 1 Dec 2005 05:15:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932134AbVLAKOs (ORCPT ); Thu, 1 Dec 2005 05:14:48 -0500 Received: from ns.ustc.edu.cn ([202.38.64.1]:13213 "EHLO mx1.ustc.edu.cn") by vger.kernel.org with ESMTP id S932132AbVLAKOm (ORCPT ); Thu, 1 Dec 2005 05:14:42 -0500 Message-Id: <20051201102208.505915000@localhost.localdomain> References: <20051201101810.837245000@localhost.localdomain> Date: Thu, 01 Dec 2005 18:18:22 +0800 From: Wu Fengguang To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Christoph Lameter , Rik van Riel , Peter Zijlstra , Nick Piggin , Andrea Arcangeli , Marcelo Tosatti , Magnus Damm , Wu Fengguang Subject: [PATCH 12/12] mm: fix minor scan count bugs Content-Disposition: inline; filename=mm-scan-accounting-fix.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1344 Lines: 47 - in isolate_lru_pages(): reports one more scan. Fix it. - in shrink_cache(): 0 pages taken does not mean 0 pages scanned. Fix it. Signed-off-by: Wu Fengguang --- mm/vmscan.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) --- linux.orig/mm/vmscan.c +++ linux/mm/vmscan.c @@ -920,7 +920,8 @@ static int isolate_lru_pages(int nr_to_s struct page *page; int scan = 0; - while (scan++ < nr_to_scan && !list_empty(src)) { + while (scan < nr_to_scan && !list_empty(src)) { + scan++; page = lru_to_page(src); prefetchw_prev_lru_page(page, src, flags); @@ -967,14 +968,15 @@ static void shrink_cache(struct zone *zo update_zone_age(zone, nr_scan); spin_unlock_irq(&zone->lru_lock); - if (nr_taken == 0) - return; - sc->nr_scanned += nr_scan; if (current_is_kswapd()) mod_page_state_zone(zone, pgscan_kswapd, nr_scan); else mod_page_state_zone(zone, pgscan_direct, nr_scan); + + if (nr_taken == 0) + return; + nr_freed = shrink_list(&page_list, sc); if (current_is_kswapd()) mod_page_state(kswapd_steal, nr_freed); -- - 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/