| Message ID | 20220322091421.25285-1-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/slab: remove some unused functions | expand |
On 2022/3/22 17:14, Miaohe Lin wrote: > alternate_node_alloc and ____cache_alloc_node are always called when > CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also > forward declaration for alternate_node_alloc is unnecessary. Remove > it too. > friendly ping. :) > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > mm/slab.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index d9dec7a8fd79..81301df47057 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -619,18 +619,6 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) > return 0; > } > > -static inline void *alternate_node_alloc(struct kmem_cache *cachep, > - gfp_t flags) > -{ > - return NULL; > -} > - > -static inline void *____cache_alloc_node(struct kmem_cache *cachep, > - gfp_t flags, int nodeid) > -{ > - return NULL; > -} > - > static inline gfp_t gfp_exact_node(gfp_t flags) > { > return flags & ~__GFP_NOFAIL; > @@ -639,7 +627,6 @@ static inline gfp_t gfp_exact_node(gfp_t flags) > #else /* CONFIG_NUMA */ > > static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); > -static void *alternate_node_alloc(struct kmem_cache *, gfp_t); > > static struct alien_cache *__alloc_alien_cache(int node, int entries, > int batch, gfp_t gfp) >
On 22.03.22 10:14, Miaohe Lin wrote: > alternate_node_alloc and ____cache_alloc_node are always called when > CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also > forward declaration for alternate_node_alloc is unnecessary. Remove > it too. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > mm/slab.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/mm/slab.c b/mm/slab.c > index d9dec7a8fd79..81301df47057 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -619,18 +619,6 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) > return 0; > } > > -static inline void *alternate_node_alloc(struct kmem_cache *cachep, > - gfp_t flags) > -{ > - return NULL; > -} > - > -static inline void *____cache_alloc_node(struct kmem_cache *cachep, > - gfp_t flags, int nodeid) > -{ > - return NULL; > -} > - > static inline gfp_t gfp_exact_node(gfp_t flags) > { > return flags & ~__GFP_NOFAIL; > @@ -639,7 +627,6 @@ static inline gfp_t gfp_exact_node(gfp_t flags) > #else /* CONFIG_NUMA */ > > static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); > -static void *alternate_node_alloc(struct kmem_cache *, gfp_t); > > static struct alien_cache *__alloc_alien_cache(int node, int entries, > int batch, gfp_t gfp) Reviewed-by: David Hildenbrand <david@redhat.com>
On 3/22/22 10:14, Miaohe Lin wrote: > alternate_node_alloc and ____cache_alloc_node are always called when > CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also > forward declaration for alternate_node_alloc is unnecessary. Remove > it too. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- Adding to the slab tree, thanks. Included also this move of declaration closer to its users: diff --git a/mm/slab.c b/mm/slab.c index 4ea12ddaa7db..90b16c7ae01a 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -626,8 +626,6 @@ static inline gfp_t gfp_exact_node(gfp_t flags) #else /* CONFIG_NUMA */ -static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); - static struct alien_cache *__alloc_alien_cache(int node, int entries, int batch, gfp_t gfp) { @@ -3043,6 +3041,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) } #ifdef CONFIG_NUMA +static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); + /* * Try allocating on another node if PFA_SPREAD_SLAB is a mempolicy is set. *
On Tue, Mar 22, 2022 at 05:14:21PM +0800, Miaohe Lin wrote: > alternate_node_alloc and ____cache_alloc_node are always called when > CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also > forward declaration for alternate_node_alloc is unnecessary. Remove > it too. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> Thanks!
On 2022/4/4 20:49, Vlastimil Babka wrote: > On 3/22/22 10:14, Miaohe Lin wrote: >> alternate_node_alloc and ____cache_alloc_node are always called when >> CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also >> forward declaration for alternate_node_alloc is unnecessary. Remove >> it too. >> >> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> >> --- > > Adding to the slab tree, thanks. > > Included also this move of declaration closer to its users: Many thanks for doing this. :) > > diff --git a/mm/slab.c b/mm/slab.c > index 4ea12ddaa7db..90b16c7ae01a 100644 > --- a/mm/slab.c > +++ b/mm/slab.c > @@ -626,8 +626,6 @@ static inline gfp_t gfp_exact_node(gfp_t flags) > > #else /* CONFIG_NUMA */ > > -static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); > - > static struct alien_cache *__alloc_alien_cache(int node, int entries, > int batch, gfp_t gfp) > { > @@ -3043,6 +3041,8 @@ static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags) > } > > #ifdef CONFIG_NUMA > +static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); > + > /* > * Try allocating on another node if PFA_SPREAD_SLAB is a mempolicy is set. > * > > . >
diff --git a/mm/slab.c b/mm/slab.c index d9dec7a8fd79..81301df47057 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -619,18 +619,6 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) return 0; } -static inline void *alternate_node_alloc(struct kmem_cache *cachep, - gfp_t flags) -{ - return NULL; -} - -static inline void *____cache_alloc_node(struct kmem_cache *cachep, - gfp_t flags, int nodeid) -{ - return NULL; -} - static inline gfp_t gfp_exact_node(gfp_t flags) { return flags & ~__GFP_NOFAIL; @@ -639,7 +627,6 @@ static inline gfp_t gfp_exact_node(gfp_t flags) #else /* CONFIG_NUMA */ static void *____cache_alloc_node(struct kmem_cache *, gfp_t, int); -static void *alternate_node_alloc(struct kmem_cache *, gfp_t); static struct alien_cache *__alloc_alien_cache(int node, int entries, int batch, gfp_t gfp)
alternate_node_alloc and ____cache_alloc_node are always called when CONFIG_NUMA. So we can remove the unused !CONFIG_NUMA variant. Also forward declaration for alternate_node_alloc is unnecessary. Remove it too. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- mm/slab.c | 13 ------------- 1 file changed, 13 deletions(-)