Commit 0c710013 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds

SLUB: add some more inlines and #ifdef CONFIG_SLUB_DEBUG

Add #ifdefs around data structures only needed if debugging is compiled into
SLUB.

Add inlines to small functions to reduce code size.
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d07dbea4
...@@ -16,7 +16,9 @@ struct kmem_cache_node { ...@@ -16,7 +16,9 @@ struct kmem_cache_node {
unsigned long nr_partial; unsigned long nr_partial;
atomic_long_t nr_slabs; atomic_long_t nr_slabs;
struct list_head partial; struct list_head partial;
#ifdef CONFIG_SLUB_DEBUG
struct list_head full; struct list_head full;
#endif
}; };
/* /*
...@@ -44,7 +46,9 @@ struct kmem_cache { ...@@ -44,7 +46,9 @@ struct kmem_cache {
int align; /* Alignment */ int align; /* Alignment */
const char *name; /* Name (only for display!) */ const char *name; /* Name (only for display!) */
struct list_head list; /* List of slab caches */ struct list_head list; /* List of slab caches */
#ifdef CONFIG_SLUB_DEBUG
struct kobject kobj; /* For sysfs */ struct kobject kobj; /* For sysfs */
#endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int defrag_ratio; int defrag_ratio;
......
...@@ -252,9 +252,10 @@ static int sysfs_slab_add(struct kmem_cache *); ...@@ -252,9 +252,10 @@ static int sysfs_slab_add(struct kmem_cache *);
static int sysfs_slab_alias(struct kmem_cache *, const char *); static int sysfs_slab_alias(struct kmem_cache *, const char *);
static void sysfs_slab_remove(struct kmem_cache *); static void sysfs_slab_remove(struct kmem_cache *);
#else #else
static int sysfs_slab_add(struct kmem_cache *s) { return 0; } static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; }
static int sysfs_slab_alias(struct kmem_cache *s, const char *p) { return 0; } static inline int sysfs_slab_alias(struct kmem_cache *s, const char *p)
static void sysfs_slab_remove(struct kmem_cache *s) {} { return 0; }
static inline void sysfs_slab_remove(struct kmem_cache *s) {}
#endif #endif
/******************************************************************** /********************************************************************
...@@ -1395,7 +1396,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, int cpu) ...@@ -1395,7 +1396,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page, int cpu)
unfreeze_slab(s, page); unfreeze_slab(s, page);
} }
static void flush_slab(struct kmem_cache *s, struct page *page, int cpu) static inline void flush_slab(struct kmem_cache *s, struct page *page, int cpu)
{ {
slab_lock(page); slab_lock(page);
deactivate_slab(s, page, cpu); deactivate_slab(s, page, cpu);
...@@ -1405,7 +1406,7 @@ static void flush_slab(struct kmem_cache *s, struct page *page, int cpu) ...@@ -1405,7 +1406,7 @@ static void flush_slab(struct kmem_cache *s, struct page *page, int cpu)
* Flush cpu slab. * Flush cpu slab.
* Called from IPI handler with interrupts disabled. * Called from IPI handler with interrupts disabled.
*/ */
static void __flush_cpu_slab(struct kmem_cache *s, int cpu) static inline void __flush_cpu_slab(struct kmem_cache *s, int cpu)
{ {
struct page *page = s->cpu_slab[cpu]; struct page *page = s->cpu_slab[cpu];
...@@ -2165,7 +2166,7 @@ static int free_list(struct kmem_cache *s, struct kmem_cache_node *n, ...@@ -2165,7 +2166,7 @@ static int free_list(struct kmem_cache *s, struct kmem_cache_node *n,
/* /*
* Release all resources used by a slab cache. * Release all resources used by a slab cache.
*/ */
static int kmem_cache_close(struct kmem_cache *s) static inline int kmem_cache_close(struct kmem_cache *s)
{ {
int node; int node;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment