slab: make kmem_cache_create_usercopy() static inline

Make kmem_cache_create_usercopy() a static inline function.

Signed-off-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/include/linux/slab.h b/include/linux/slab.h
index cb82a6414a289c4bcd1133f9c77b74192a91696f..634717c9f73b7f68c56ed41cc289214911fd9b23 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -266,11 +266,50 @@ struct kmem_cache *__kmem_cache_create_args(const char *name,
 struct kmem_cache *__kmem_cache_create(const char *name, unsigned int size,
                                       unsigned int align, slab_flags_t flags,
                                       void (*ctor)(void *));
-struct kmem_cache *kmem_cache_create_usercopy(const char *name,
-                       unsigned int size, unsigned int align,
-                       slab_flags_t flags,
-                       unsigned int useroffset, unsigned int usersize,
-                       void (*ctor)(void *));
+
+/**
+ * kmem_cache_create_usercopy - Create a cache with a region suitable
+ * for copying to userspace
+ * @name: A string which is used in /proc/slabinfo to identify this cache.
+ * @size: The size of objects to be created in this cache.
+ * @align: The required alignment for the objects.
+ * @flags: SLAB flags
+ * @useroffset: Usercopy region offset
+ * @usersize: Usercopy region size
+ * @ctor: A constructor for the objects.
+ *
+ * Cannot be called within a interrupt, but can be interrupted.
+ * The @ctor is run when new pages are allocated by the cache.
+ *
+ * The flags are
+ *
+ * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5)
+ * to catch references to uninitialised memory.
+ *
+ * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check
+ * for buffer overruns.
+ *
+ * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware
+ * cacheline.  This can be beneficial if you're counting cycles as closely
+ * as davem.
+ *
+ * Return: a pointer to the cache on success, NULL on failure.
+ */
+static inline struct kmem_cache *
+kmem_cache_create_usercopy(const char *name, unsigned int size,
+                          unsigned int align, slab_flags_t flags,
+                          unsigned int useroffset, unsigned int usersize,
+                          void (*ctor)(void *))
+{
+       struct kmem_cache_args kmem_args = {
+               .align          = align,
+               .ctor           = ctor,
+               .useroffset     = useroffset,
+               .usersize       = usersize,
+       };
+
+       return __kmem_cache_create_args(name, size, &kmem_args, flags);
+}
 
 /* If NULL is passed for @args, use this variant with default arguments. */
 static inline struct kmem_cache *

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 9133b9fafcb127eeb2d8bfbd9e44a962e5d60c14..3477a3918afd800a8398e0ef25ea3eaea0c03ca7 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -337,51 +337,6 @@ out_unlock:
 }
 EXPORT_SYMBOL(__kmem_cache_create_args);
 
-/**
- * kmem_cache_create_usercopy - Create a cache with a region suitable
- * for copying to userspace
- * @name: A string which is used in /proc/slabinfo to identify this cache.
- * @size: The size of objects to be created in this cache.
- * @align: The required alignment for the objects.
- * @flags: SLAB flags
- * @useroffset: Usercopy region offset
- * @usersize: Usercopy region size
- * @ctor: A constructor for the objects.
- *
- * Cannot be called within a interrupt, but can be interrupted.
- * The @ctor is run when new pages are allocated by the cache.
- *
- * The flags are
- *
- * %SLAB_POISON - Poison the slab with a known test pattern (a5a5a5a5)
- * to catch references to uninitialised memory.
- *
- * %SLAB_RED_ZONE - Insert `Red` zones around the allocated memory to check
- * for buffer overruns.
- *
- * %SLAB_HWCACHE_ALIGN - Align the objects in this cache to a hardware
- * cacheline.  This can be beneficial if you're counting cycles as closely
- * as davem.
- *
- * Return: a pointer to the cache on success, NULL on failure.
- */
-struct kmem_cache *
-kmem_cache_create_usercopy(const char *name, unsigned int size,
-                          unsigned int align, slab_flags_t flags,
-                          unsigned int useroffset, unsigned int usersize,
-                          void (*ctor)(void *))
-{
-       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);
-
 /**
  * __kmem_cache_create - Create a cache.
  * @name: A string which is used in /proc/slabinfo to identify this cache.