mm, slab: remove unused object_size parameter in kmem_cache_flags()

We don't use the object_size parameter in kmem_cache_flags(), so just
remove it.

Signed-off-by: Chengming Zhou <chengming.zhou@linux.dev>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/slab.h b/mm/slab.h
index 9abec38be1d08cd22efbe7a3e4203893e2226531..6b879d8e8a7a021f3dcef2a903615c36a4e35657 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -433,8 +433,7 @@ struct kmem_cache *
 __kmem_cache_alias(const char *name, unsigned int size, unsigned int align,
                   slab_flags_t flags, void (*ctor)(void *));
 
-slab_flags_t kmem_cache_flags(unsigned int object_size,
-       slab_flags_t flags, const char *name);
+slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name);
 
 static inline bool is_kmalloc_cache(struct kmem_cache *s)
 {

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 1910252d7e89b8377a82852565a99184238a2021..e19544043fdf440ac0322ecc06b333b8c6c3e5cb 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -172,7 +172,7 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align,
        size = ALIGN(size, sizeof(void *));
        align = calculate_alignment(flags, align, size);
        size = ALIGN(size, align);
-       flags = kmem_cache_flags(size, flags, name);
+       flags = kmem_cache_flags(flags, name);
 
        if (flags & SLAB_NEVER_MERGE)
                return NULL;

diff --git a/mm/slub.c b/mm/slub.c
index 4ebc0df410fff53f5030bd7181e723a380ee9306..d8d8dd8e980321d89e4fc3b18d3a0980245aecb7 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1765,7 +1765,6 @@ __setup_param("slub_debug", slub_debug, setup_slub_debug, 0);
 
 /*
  * kmem_cache_flags - apply debugging options to the cache
- * @object_size:       the size of an object without meta data
  * @flags:             flags to set
  * @name:              name of the cache
  *
@@ -1774,8 +1773,7 @@ __setup_param("slub_debug", slub_debug, setup_slub_debug, 0);
  * slab_debug=<Debug-Options>,<slab name1>,<slab name2> ...
  * then only the select slabs will receive the debug option(s).
  */
-slab_flags_t kmem_cache_flags(unsigned int object_size,
-       slab_flags_t flags, const char *name)
+slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name)
 {
        char *iter;
        size_t len;
@@ -1851,8 +1849,7 @@ static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
                                        struct slab *slab) {}
 static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n,
                                        struct slab *slab) {}
-slab_flags_t kmem_cache_flags(unsigned int object_size,
-       slab_flags_t flags, const char *name)
+slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name)
 {
        return flags;
 }
@@ -5105,7 +5102,7 @@ static int calculate_sizes(struct kmem_cache *s)
 
 static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
 {
-       s->flags = kmem_cache_flags(s->size, flags, s->name);
+       s->flags = kmem_cache_flags(flags, s->name);
 #ifdef CONFIG_SLAB_FREELIST_HARDENED
        s->random = get_random_long();
 #endif