mm/slub: remove parameter 'flags' in create_kmalloc_caches()

After commit 16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h"),
parameter 'flags' is only passed as 0 in create_kmalloc_caches(), and
then it is only passed to new_kmalloc_cache().

So we can change parameter 'flags' to be a local variable with
initial value 0 in new_kmalloc_cache() and remove parameter 'flags'
in create_kmalloc_caches(). Also make new_kmalloc_cache() static
due to it is only used in mm/slab_common.c.

Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
Acked-by: David Rientjes <rientjes@google.com>
Reviewed-by: Chengming Zhou <zhouchengming@bytedance.com>
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

diff --git a/mm/slab.h b/mm/slab.h
index f7df6d701c5b72e324f5fde33c6e5941a4acf531..9abec38be1d08cd22efbe7a3e4203893e2226531 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -387,7 +387,7 @@ extern const struct kmalloc_info_struct {
 
 /* Kmalloc array related functions */
 void setup_kmalloc_cache_index_table(void);
-void create_kmalloc_caches(slab_flags_t);
+void create_kmalloc_caches(void);
 
 extern u8 kmalloc_size_index[24];
 
@@ -422,8 +422,6 @@ gfp_t kmalloc_fix_flags(gfp_t flags);
 int __kmem_cache_create(struct kmem_cache *, slab_flags_t flags);
 
 void __init kmem_cache_init(void);
-void __init new_kmalloc_cache(int idx, enum kmalloc_cache_type type,
-                             slab_flags_t flags);
 extern void create_boot_cache(struct kmem_cache *, const char *name,
                        unsigned int size, slab_flags_t flags,
                        unsigned int useroffset, unsigned int usersize);

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 230ef7cc3467de0c7449965a489bc38913199d55..1910252d7e89b8377a82852565a99184238a2021 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -853,9 +853,10 @@ static unsigned int __kmalloc_minalign(void)
        return max(minalign, arch_slab_minalign());
 }
 
-void __init
-new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
+static void __init
+new_kmalloc_cache(int idx, enum kmalloc_cache_type type)
 {
+       slab_flags_t flags = 0;
        unsigned int minalign = __kmalloc_minalign();
        unsigned int aligned_size = kmalloc_info[idx].size;
        int aligned_idx = idx;
@@ -902,7 +903,7 @@ new_kmalloc_cache(int idx, enum kmalloc_cache_type type, slab_flags_t flags)
  * may already have been created because they were needed to
  * enable allocations for slab creation.
  */
-void __init create_kmalloc_caches(slab_flags_t flags)
+void __init create_kmalloc_caches(void)
 {
        int i;
        enum kmalloc_cache_type type;
@@ -913,7 +914,7 @@ void __init create_kmalloc_caches(slab_flags_t flags)
        for (type = KMALLOC_NORMAL; type < NR_KMALLOC_TYPES; type++) {
                for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
                        if (!kmalloc_caches[type][i])
-                               new_kmalloc_cache(i, type, flags);
+                               new_kmalloc_cache(i, type);
 
                        /*
                         * Caches that are not of the two-to-the-power-of size.
@@ -922,10 +923,10 @@ void __init create_kmalloc_caches(slab_flags_t flags)
                         */
                        if (KMALLOC_MIN_SIZE <= 32 && i == 6 &&
                                        !kmalloc_caches[type][1])
-                               new_kmalloc_cache(1, type, flags);
+                               new_kmalloc_cache(1, type);
                        if (KMALLOC_MIN_SIZE <= 64 && i == 7 &&
                                        !kmalloc_caches[type][2])
-                               new_kmalloc_cache(2, type, flags);
+                               new_kmalloc_cache(2, type);
                }
        }
 #ifdef CONFIG_RANDOM_KMALLOC_CACHES

diff --git a/mm/slub.c b/mm/slub.c
index e66bc888d23b83bfbee9e27775a3e1ca6bf9beb0..4ebc0df410fff53f5030bd7181e723a380ee9306 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -5668,7 +5668,7 @@ void __init kmem_cache_init(void)
 
        /* Now we can use the kmem_cache to allocate kmalloc slabs */
        setup_kmalloc_cache_index_table();
-       create_kmalloc_caches(0);
+       create_kmalloc_caches();
 
        /* Setup random freelists for each cache */
        init_freelist_randomization();