Slab API: remove useless ctor parameter and reorder parameters
Slab constructors currently have a flags parameter that is never used. And the order of the arguments is opposite to other slab functions. The object pointer is placed before the kmem_cache pointer. Convert ctor(void *object, struct kmem_cache *s, unsigned long flags) to ctor(struct kmem_cache *s, void *object) throughout the kernel [akpm@linux-foundation.org: coupla fixes] Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
b811c202a0
commit
4ba9b9d0ba
@@ -499,12 +499,12 @@ struct kmem_cache {
|
||||
unsigned int size, align;
|
||||
unsigned long flags;
|
||||
const char *name;
|
||||
void (*ctor)(void *, struct kmem_cache *, unsigned long);
|
||||
void (*ctor)(struct kmem_cache *, void *);
|
||||
};
|
||||
|
||||
struct kmem_cache *kmem_cache_create(const char *name, size_t size,
|
||||
size_t align, unsigned long flags,
|
||||
void (*ctor)(void*, struct kmem_cache *, unsigned long))
|
||||
void (*ctor)(struct kmem_cache *, void *))
|
||||
{
|
||||
struct kmem_cache *c;
|
||||
|
||||
@@ -548,7 +548,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
|
||||
b = slob_new_page(flags, get_order(c->size), node);
|
||||
|
||||
if (c->ctor)
|
||||
c->ctor(b, c, 0);
|
||||
c->ctor(c, b);
|
||||
|
||||
return b;
|
||||
}
|
||||
|
Reference in New Issue
Block a user