Skip to content

Commit 1d3d764

Browse files
braunertehcaster
authored andcommitted
slab: port kmem_cache_create_usercopy() to struct kmem_cache_args
Port kmem_cache_create_usercopy() to struct kmem_cache_args and remove the now unused do_kmem_cache_create_usercopy() helper. Reviewed-by: Kees Cook <[email protected]> Reviewed-by: Jens Axboe <[email protected]> Reviewed-by: Mike Rapoport (Microsoft) <[email protected]> Reviewed-by: Vlastimil Babka <[email protected]> Signed-off-by: Christian Brauner <[email protected]> Reviewed-by: Roman Gushchin <[email protected]> Signed-off-by: Vlastimil Babka <[email protected]>
1 parent 9816c3c commit 1d3d764

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

mm/slab_common.c

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -351,26 +351,6 @@ struct kmem_cache *__kmem_cache_create_args(const char *name,
351351
}
352352
EXPORT_SYMBOL(__kmem_cache_create_args);
353353

354-
static struct kmem_cache *
355-
do_kmem_cache_create_usercopy(const char *name,
356-
unsigned int size, unsigned int freeptr_offset,
357-
unsigned int align, slab_flags_t flags,
358-
unsigned int useroffset, unsigned int usersize,
359-
void (*ctor)(void *))
360-
{
361-
struct kmem_cache_args kmem_args = {
362-
.align = align,
363-
.use_freeptr_offset = freeptr_offset != UINT_MAX,
364-
.freeptr_offset = freeptr_offset,
365-
.useroffset = useroffset,
366-
.usersize = usersize,
367-
.ctor = ctor,
368-
};
369-
370-
return __kmem_cache_create_args(name, size, &kmem_args, flags);
371-
}
372-
373-
374354
/**
375355
* kmem_cache_create_usercopy - Create a cache with a region suitable
376356
* for copying to userspace
@@ -405,8 +385,14 @@ kmem_cache_create_usercopy(const char *name, unsigned int size,
405385
unsigned int useroffset, unsigned int usersize,
406386
void (*ctor)(void *))
407387
{
408-
return do_kmem_cache_create_usercopy(name, size, UINT_MAX, align, flags,
409-
useroffset, usersize, ctor);
388+
struct kmem_cache_args kmem_args = {
389+
.align = align,
390+
.ctor = ctor,
391+
.useroffset = useroffset,
392+
.usersize = usersize,
393+
};
394+
395+
return __kmem_cache_create_args(name, size, &kmem_args, flags);
410396
}
411397
EXPORT_SYMBOL(kmem_cache_create_usercopy);
412398

0 commit comments

Comments
 (0)