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 <kees@kernel.org>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/slab_common.c b/mm/slab_common.c
index da62ed30f95d512aede1cbef9ca5fdc307afac03..16c36a94613512d65e01155a316775a5232705d9 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -351,26 +351,6 @@ out_unlock:
 }
 EXPORT_SYMBOL(__kmem_cache_create_args);
 
-static struct kmem_cache *
-do_kmem_cache_create_usercopy(const char *name,
-                 unsigned int size, unsigned int freeptr_offset,
-                 unsigned int align, slab_flags_t flags,
-                 unsigned int useroffset, unsigned int usersize,
-                 void (*ctor)(void *))
-{
-       struct kmem_cache_args kmem_args = {
-               .align                  = align,
-               .use_freeptr_offset     = freeptr_offset != UINT_MAX,
-               .freeptr_offset         = freeptr_offset,
-               .useroffset             = useroffset,
-               .usersize               = usersize,
-               .ctor                   = ctor,
-       };
-
-       return __kmem_cache_create_args(name, size, &kmem_args, flags);
-}
-
-
 /**
  * kmem_cache_create_usercopy - Create a cache with a region suitable
  * for copying to userspace
@@ -405,8 +385,14 @@ kmem_cache_create_usercopy(const char *name, unsigned int size,
                           unsigned int useroffset, unsigned int usersize,
                           void (*ctor)(void *))
 {
-       return do_kmem_cache_create_usercopy(name, size, UINT_MAX, align, flags,
-                                            useroffset, usersize, ctor);
+       struct kmem_cache_args kmem_args = {
+               .align          = align,
+               .ctor           = ctor,
+               .useroffset     = useroffset,
+               .usersize       = usersize,
+       };
+
+       return __kmem_cache_create_args(name, size, &kmem_args, flags);
 }
 EXPORT_SYMBOL(kmem_cache_create_usercopy);