From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE414C433DB for ; Tue, 26 Jan 2021 10:54:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 54C27230FD for ; Tue, 26 Jan 2021 10:54:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54C27230FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 762DD8D00C0; Tue, 26 Jan 2021 05:54:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 712798D00B0; Tue, 26 Jan 2021 05:54:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5DAA78D00C0; Tue, 26 Jan 2021 05:54:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0199.hostedemail.com [216.40.44.199]) by kanga.kvack.org (Postfix) with ESMTP id 479B88D00B0 for ; Tue, 26 Jan 2021 05:54:01 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 126938249980 for ; Tue, 26 Jan 2021 10:54:01 +0000 (UTC) X-FDA: 77747616282.13.point01_4a10f7d2758d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id DB0FB18140B70 for ; Tue, 26 Jan 2021 10:54:00 +0000 (UTC) X-HE-Tag: point01_4a10f7d2758d X-Filterd-Recvd-Size: 5368 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf19.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 Jan 2021 10:53:59 +0000 (UTC) Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DQ3Ty6PZYzj8jc; Tue, 26 Jan 2021 18:52:38 +0800 (CST) Received: from [10.174.179.117] (10.174.179.117) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Tue, 26 Jan 2021 18:53:47 +0800 Subject: Re: [PATCH] mm: Remove ctor argument from kmem_cache_flags To: Nikolay Borisov CC: , , , , , References: <20210126095733.974665-1-nborisov@suse.com> From: Miaohe Lin Message-ID: <7e49dfda-30f3-cb04-e22b-033461074896@huawei.com> Date: Tue, 26 Jan 2021 18:53:47 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210126095733.974665-1-nborisov@suse.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.117] X-CFilter-Loop: Reflected X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi: On 2021/1/26 17:57, Nikolay Borisov wrote: > This argument hasn't been used since e153362a50a3 ("slub: Remove objsize > check in kmem_cache_flags()") so simply remove it. > > Signed-off-by: Nikolay Borisov Reviewed-by: Miaohe Lin > --- > mm/slab.c | 3 +-- > mm/slab.h | 6 ++---- > mm/slab_common.c | 2 +- > mm/slub.c | 9 +++------ > 4 files changed, 7 insertions(+), 13 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index d7c8da9319c7..e2d2044389ea 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -1790,8 +1790,7 @@ static int __ref setup_cpu_cache(struct kmem_cache *cachep, gfp_t gfp) > } > > slab_flags_t kmem_cache_flags(unsigned int object_size, > - slab_flags_t flags, const char *name, > - void (*ctor)(void *)) > + slab_flags_t flags, const char *name) > { > return flags; > } > diff --git a/mm/slab.h b/mm/slab.h > index 1a756a359fa8..9e83616bb5b4 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -110,8 +110,7 @@ __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, > - void (*ctor)(void *)); > + slab_flags_t flags, const char *name); > #else > static inline struct kmem_cache * > __kmem_cache_alias(const char *name, unsigned int size, unsigned int align, > @@ -119,8 +118,7 @@ __kmem_cache_alias(const char *name, unsigned int size, unsigned int align, > { return NULL; } > > static inline slab_flags_t kmem_cache_flags(unsigned int object_size, > - slab_flags_t flags, const char *name, > - void (*ctor)(void *)) > + slab_flags_t flags, const char *name) > { > return flags; > } > diff --git a/mm/slab_common.c b/mm/slab_common.c > index e981c80d216c..fef51f9401e4 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -197,7 +197,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, NULL); > + flags = kmem_cache_flags(size, flags, name); > > if (flags & SLAB_NEVER_MERGE) > return NULL; > diff --git a/mm/slub.c b/mm/slub.c > index 69742ab9a21d..9821470090f0 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -1400,7 +1400,6 @@ __setup("slub_debug", setup_slub_debug); > * @object_size: the size of an object without meta data > * @flags: flags to set > * @name: name of the cache > - * @ctor: constructor function > * > * Debug option(s) are applied to @flags. In addition to the debug > * option(s), if a slab name (or multiple) is specified i.e. > @@ -1408,8 +1407,7 @@ __setup("slub_debug", setup_slub_debug); > * 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, > - void (*ctor)(void *)) > + slab_flags_t flags, const char *name) > { > char *iter; > size_t len; > @@ -1474,8 +1472,7 @@ static inline void add_full(struct kmem_cache *s, struct kmem_cache_node *n, > static inline void remove_full(struct kmem_cache *s, struct kmem_cache_node *n, > struct page *page) {} > slab_flags_t kmem_cache_flags(unsigned int object_size, > - slab_flags_t flags, const char *name, > - void (*ctor)(void *)) > + slab_flags_t flags, const char *name) > { > return flags; > } > @@ -3783,7 +3780,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) > > static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags) > { > - s->flags = kmem_cache_flags(s->size, flags, s->name, s->ctor); > + s->flags = kmem_cache_flags(s->size, flags, s->name); > #ifdef CONFIG_SLAB_FREELIST_HARDENED > s->random = get_random_long(); > #endif >