aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 08:03:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

memory tier: rename destroy_memory_type() to put_memory_type()

Browse Source 
It appears that destroy_memory_type() isn't a very good name because we
usually will not free the memory_type here.  So rename it to a more
appropriate name i.e.  put_memory_type().

Link: https://lkml.kernel.org/r/20230706063905.543800-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Suggested-by: Huang, Ying <ying.huang@intel.com>
Reviewed-by: "Huang, Ying" <ying.huang@intel.com>
Reviewed-by: Xiao Yang <yangx.jy@fujitsu.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Miaohe Lin
2023-07-06 14:39:05 +08:00
committed by Andrew Morton
parent badbbcd765
commit bded67f81e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dax/kmem.c
View File

@@ -264,7 +264,7 @@ static int __init dax_kmem_init(void)
return rc; return rc;
error_dax_driver: error_dax_driver:
destroy_memory_type(dax_slowmem_type); put_memory_type(dax_slowmem_type);
err_dax_slowmem_type: err_dax_slowmem_type:
kfree_const(kmem_name); kfree_const(kmem_name);
return rc; return rc;
@@ -275,7 +275,7 @@ static void __exit dax_kmem_exit(void)
dax_driver_unregister(&device_dax_kmem_driver); dax_driver_unregister(&device_dax_kmem_driver);
if (!any_hotremove_failed) if (!any_hotremove_failed)
kfree_const(kmem_name); kfree_const(kmem_name);
destroy_memory_type(dax_slowmem_type); put_memory_type(dax_slowmem_type);
} }
MODULE_AUTHOR("Intel Corporation"); MODULE_AUTHOR("Intel Corporation");

4
include/linux/memory-tiers.h
View File

@@ -33,7 +33,7 @@ struct memory_dev_type {
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
extern bool numa_demotion_enabled; extern bool numa_demotion_enabled;
struct memory_dev_type *alloc_memory_type(int adistance); struct memory_dev_type *alloc_memory_type(int adistance);
void destroy_memory_type(struct memory_dev_type *memtype); void put_memory_type(struct memory_dev_type *memtype);
void init_node_memory_type(int node, struct memory_dev_type *default_type); void init_node_memory_type(int node, struct memory_dev_type *default_type);
void clear_node_memory_type(int node, struct memory_dev_type *memtype); void clear_node_memory_type(int node, struct memory_dev_type *memtype);
#ifdef CONFIG_MIGRATION #ifdef CONFIG_MIGRATION
@@ -68,7 +68,7 @@ static inline struct memory_dev_type *alloc_memory_type(int adistance)
return NULL; return NULL;
} }
static inline void destroy_memory_type(struct memory_dev_type *memtype) static inline void put_memory_type(struct memory_dev_type *memtype)
{ {
} }

6
mm/memory-tiers.c
View File

@@ -560,11 +560,11 @@ struct memory_dev_type *alloc_memory_type(int adistance)
} }
EXPORT_SYMBOL_GPL(alloc_memory_type); EXPORT_SYMBOL_GPL(alloc_memory_type);
void destroy_memory_type(struct memory_dev_type *memtype) void put_memory_type(struct memory_dev_type *memtype)
{ {
kref_put(&memtype->kref, release_memtype); kref_put(&memtype->kref, release_memtype);
} }
EXPORT_SYMBOL_GPL(destroy_memory_type); EXPORT_SYMBOL_GPL(put_memory_type);
void init_node_memory_type(int node, struct memory_dev_type *memtype) void init_node_memory_type(int node, struct memory_dev_type *memtype)
{ {
@@ -586,7 +586,7 @@ void clear_node_memory_type(int node, struct memory_dev_type *memtype)
*/ */
if (!node_memory_types[node].map_count) { if (!node_memory_types[node].map_count) {
node_memory_types[node].memtype = NULL; node_memory_types[node].memtype = NULL;
destroy_memory_type(memtype); put_memory_type(memtype);
} }
mutex_unlock(&memory_tier_lock); mutex_unlock(&memory_tier_lock);
} }