Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 242860a4 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Pekka Enberg
Browse files

mm/sl[aou]b: Move common kmem_cache_size() to slab.h 



This function is identically defined in all three allocators
and it's trivial to move it to slab.h

Since now it's static, inline, header-defined function
this patch also drops the EXPORT_SYMBOL tag.

Cc: Pekka Enberg <penberg@kernel.org>
Cc: Matt Mackall <mpm@selenic.com>
Acked-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent fe74fe2b

include/linux/slab.h

+8 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ struct kmem_cache *kmem_cache_create(const char *, size_t, size_t, 
void kmem_cache_destroy(struct kmem_cache *);

int kmem_cache_shrink(struct kmem_cache *);

void kmem_cache_free(struct kmem_cache *, void *);

unsigned int kmem_cache_size(struct kmem_cache *);



/*

 * Please use this macro to create slab caches. Simply specify the
@@ -388,6 +387,14 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node) 
	return kmalloc_node(size, flags | __GFP_ZERO, node);

}



/*

 * Determine the size of a slab object

 */

static inline unsigned int kmem_cache_size(struct kmem_cache *s)

{

	return s->object_size;

}



void __init kmem_cache_init_late(void);



#endif	/* _LINUX_SLAB_H */

mm/slab.c

+0 −6
Original line number Diff line number Diff line
@@ -3969,12 +3969,6 @@ void kfree(const void *objp) 
}

EXPORT_SYMBOL(kfree);



unsigned int kmem_cache_size(struct kmem_cache *cachep)

{

	return cachep->object_size;

}

EXPORT_SYMBOL(kmem_cache_size);



/*

 * This initializes kmem_list3 or resizes various caches for all nodes.

 */

mm/slob.c

+0 −6
Original line number Diff line number Diff line
@@ -604,12 +604,6 @@ void kmem_cache_free(struct kmem_cache *c, void *b) 
}

EXPORT_SYMBOL(kmem_cache_free);



unsigned int kmem_cache_size(struct kmem_cache *c)

{

	return c->object_size;

}

EXPORT_SYMBOL(kmem_cache_size);



int __kmem_cache_shutdown(struct kmem_cache *c)

{

	/* No way to check for remaining objects */

mm/slub.c

+0 −9
Original line number Diff line number Diff line
@@ -3121,15 +3121,6 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags) 
	return -EINVAL;

}



/*

 * Determine the size of a slab object

 */

unsigned int kmem_cache_size(struct kmem_cache *s)

{

	return s->object_size;

}

EXPORT_SYMBOL(kmem_cache_size);



static void list_slab_objects(struct kmem_cache *s, struct page *page,

							const char *text)

{