Skip to content

Commit 303cd69

Browse files
cmzxotehcaster
authored andcommitted
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>
1 parent 66b3dc1 commit 303cd69

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

mm/slab.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,7 @@ struct kmem_cache *
433433
__kmem_cache_alias(const char *name, unsigned int size, unsigned int align,
434434
slab_flags_t flags, void (*ctor)(void *));
435435

436-
slab_flags_t kmem_cache_flags(unsigned int object_size,
437-
slab_flags_t flags, const char *name);
436+
slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name);
438437

439438
static inline bool is_kmalloc_cache(struct kmem_cache *s)
440439
{

mm/slab_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align,
172172
size = ALIGN(size, sizeof(void *));
173173
align = calculate_alignment(flags, align, size);
174174
size = ALIGN(size, align);
175-
flags = kmem_cache_flags(size, flags, name);
175+
flags = kmem_cache_flags(flags, name);
176176

177177
if (flags & SLAB_NEVER_MERGE)
178178
return NULL;

mm/slub.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,6 @@ __setup_param("slub_debug", slub_debug, setup_slub_debug, 0);
17651765

17661766
/*
17671767
* kmem_cache_flags - apply debugging options to the cache
1768-
* @object_size: the size of an object without meta data
17691768
* @flags: flags to set
17701769
* @name: name of the cache
17711770
*
@@ -1774,8 +1773,7 @@ __setup_param("slub_debug", slub_debug, setup_slub_debug, 0);
17741773
* slab_debug=<Debug-Options>,<slab name1>,<slab name2> ...
17751774
* then only the select slabs will receive the debug option(s).
17761775
*/
1777-
slab_flags_t kmem_cache_flags(unsigned int object_size,
1778-
slab_flags_t flags, const char *name)
1776+
slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name)
17791777
{
17801778
char *iter;
17811779
size_t len;
@@ -1851,8 +1849,7 @@ static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n,
18511849
struct slab *slab) {}
18521850
static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n,
18531851
struct slab *slab) {}
1854-
slab_flags_t kmem_cache_flags(unsigned int object_size,
1855-
slab_flags_t flags, const char *name)
1852+
slab_flags_t kmem_cache_flags(slab_flags_t flags, const char *name)
18561853
{
18571854
return flags;
18581855
}
@@ -5105,7 +5102,7 @@ static int calculate_sizes(struct kmem_cache *s)
51055102

51065103
static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
51075104
{
5108-
s->flags = kmem_cache_flags(s->size, flags, s->name);
5105+
s->flags = kmem_cache_flags(flags, s->name);
51095106
#ifdef CONFIG_SLAB_FREELIST_HARDENED
51105107
s->random = get_random_long();
51115108
#endif

0 commit comments

Comments
 (0)