Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265909AbUFTOrP (ORCPT ); Sun, 20 Jun 2004 10:47:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265893AbUFTOqe (ORCPT ); Sun, 20 Jun 2004 10:46:34 -0400 Received: from smtp105.mail.sc5.yahoo.com ([66.163.169.225]:46011 "HELO smtp105.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S265877AbUFTOp3 (ORCPT ); Sun, 20 Jun 2004 10:45:29 -0400 Message-ID: <40D5A305.80807@yahoo.com.au> Date: Mon, 21 Jun 2004 00:45:25 +1000 From: Nick Piggin User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040401 Debian/1.6-4 X-Accept-Language: en MIME-Version: 1.0 To: Grzegorz Kulewski CC: Linus Torvalds , Linux Kernel Mailing List , Andrew Morton Subject: Re: Memory and rsync problem with vanilla 2.6.7 References: <20040426013944.49a105a8.akpm@osdl.org> <40D508E8.2050407@yahoo.com.au> In-Reply-To: Content-Type: multipart/mixed; boundary="------------000003080300080907020407" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2254 Lines: 64 This is a multi-part message in MIME format. --------------000003080300080907020407 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Grzegorz Kulewski wrote: >>>Well it doesn't seem to have caused too much trouble as yet... But it >>>is the obvious candidate if your problems continue. If you are not a >>>bk user, the attached patch will also revert that change. >> >>Thanks, I will test it soon and I will report results. But I am not saying >>it is a bug - maybe it is simply change that can lead to problems with >>insane debug options but itself is good? > > > Are you sure that this is good patch against vanilla 2.6.7? It gives me > 2 failed hunks (both normal and -R)... Should I merge it manually? > You're right here's the correct one. --------------000003080300080907020407 Content-Type: text/x-patch; name="vm-revert-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="vm-revert-fix.patch" linux-2.6-npiggin/mm/vmscan.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff -puN mm/vmscan.c~vm-revert-fix mm/vmscan.c --- linux-2.6/mm/vmscan.c~vm-revert-fix 2004-06-21 00:43:07.000000000 +1000 +++ linux-2.6-npiggin/mm/vmscan.c 2004-06-21 00:44:30.000000000 +1000 @@ -867,9 +867,8 @@ shrink_caches(struct zone **zones, struc for (i = 0; zones[i] != NULL; i++) { struct zone *zone = zones[i]; - zone->temp_priority = sc->priority; - if (zone->prev_priority > sc->priority) - zone->prev_priority = sc->priority; + if (zone->free_pages < zone->pages_high) + zone->temp_priority = priority; if (zone->all_unreclaimable && sc->priority != DEF_PRIORITY) continue; /* Let kswapd poll it */ @@ -1044,8 +1043,6 @@ scan: all_zones_ok = 0; } zone->temp_priority = priority; - if (zone->prev_priority > priority) - zone->prev_priority = priority; sc.nr_scanned = 0; sc.nr_reclaimed = 0; sc.priority = priority; _ --------------000003080300080907020407-- - 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/