diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 17:27:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 17:27:29 +0200 |
| commit | e9dc122166b8d863d3057a66ada04838e5548e52 (patch) | |
| tree | 749e15bf719b64bf9113db7acd8e043d9742cb26 /mm/slub.c | |
| parent | sunrpc: fix memory leak in unix_gid cache. (diff) | |
| parent | SUNRPC: Ensure that sunrpc gets initialised before nfs, lockd, etc... (diff) | |
| download | linux-e9dc122166b8d863d3057a66ada04838e5548e52.tar.xz linux-e9dc122166b8d863d3057a66ada04838e5548e52.zip | |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mm/slub.c b/mm/slub.c index 819f056b39c6..b9f1491a58a1 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -21,7 +21,6 @@ #include <linux/kmemcheck.h> #include <linux/cpu.h> #include <linux/cpuset.h> -#include <linux/kmemleak.h> #include <linux/mempolicy.h> #include <linux/ctype.h> #include <linux/debugobjects.h> @@ -2595,6 +2594,8 @@ static inline int kmem_cache_close(struct kmem_cache *s) */ void kmem_cache_destroy(struct kmem_cache *s) { + if (s->flags & SLAB_DESTROY_BY_RCU) + rcu_barrier(); down_write(&slub_lock); s->refcount--; if (!s->refcount) { @@ -2833,13 +2834,15 @@ EXPORT_SYMBOL(__kmalloc); static void *kmalloc_large_node(size_t size, gfp_t flags, int node) { struct page *page; + void *ptr = NULL; flags |= __GFP_COMP | __GFP_NOTRACK; page = alloc_pages_node(node, flags, get_order(size)); if (page) - return page_address(page); - else - return NULL; + ptr = page_address(page); + + kmemleak_alloc(ptr, size, 1, flags); + return ptr; } #ifdef CONFIG_NUMA @@ -2924,6 +2927,7 @@ void kfree(const void *x) page = virt_to_head_page(x); if (unlikely(!PageSlab(page))) { BUG_ON(!PageCompound(page)); + kmemleak_free(x); put_page(page); return; } |