[PATCH] nr_slab accounting fix
From: Manfred Spraul (manfred_at_colorfullife.com)
Date: 11/29/03
- Previous message: Stefan Smietanowski: "Re: Disk Geometries reported incorrectly on 2.6.0-testX"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Sat, 29 Nov 2003 15:03:06 +0100 To: Andrew Morton <akpm@digeo.com>
Hi Andrew,
if alloc_slabmgmt fails, then kmem_freepages() calls sub_page_state(),
altough nr_slab was not yet increased. The attached patch fixes that by
moving the inc_page_state into kmem_getpages().
Could you add it to your next -mm kernel?
--
Manfred
// $Header$
// Kernel Version:
// VERSION = 2
// PATCHLEVEL = 6
// SUBLEVEL = 0
// EXTRAVERSION = -test11
--- 2.6/mm/slab.c 2003-11-29 09:46:35.000000000 +0100
+++ build-2.6/mm/slab.c 2003-11-29 14:50:06.000000000 +0100
@@ -812,6 +812,7 @@
int i = (1 << cachep->gfporder);
struct page *page = virt_to_page(addr);
+ add_page_state(nr_slab, i);
while (i--) {
SetPageSlab(page);
page++;
@@ -1608,7 +1609,6 @@
do {
SET_PAGE_CACHE(page, cachep);
SET_PAGE_SLAB(page, slabp);
- inc_page_state(nr_slab);
page++;
} while (--i);
--- 2.6/include/linux/page-flags.h 2003-10-25 20:44:06.000000000 +0200
+++ build-2.6/include/linux/page-flags.h 2003-11-29 14:45:57.000000000 +0100
@@ -133,6 +133,7 @@
#define inc_page_state(member) mod_page_state(member, 1UL)
#define dec_page_state(member) mod_page_state(member, 0UL - 1)
+#define add_page_state(member,delta) mod_page_state(member, (delta))
#define sub_page_state(member,delta) mod_page_state(member, 0UL - (delta))
-
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/
- Previous message: Stefan Smietanowski: "Re: Disk Geometries reported incorrectly on 2.6.0-testX"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
