[RFC v1 18/19] kernel, sysctl: cleanup numa_zonelist_order

Pengfei Li
2019-11-21T15:22:42Z

This is a cleanup patch.

Rename numa_zonelist_order to numa_nodelist_order, and clean up
some zonelist_xxx accordingly.

Signed-off-by: Pengfei Li <fly@kernel.page>
---
include/linux/mmzone.h | 6 +++---
kernel/sysctl.c | 8 ++++----
mm/page_alloc.c | 16 ++++++++--------
3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index f1a492c13037..0423a84dfd7d 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -959,10 +959,10 @@ int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *, int,
int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *, int,
void __user *, size_t *, loff_t *);

-extern int numa_zonelist_order_handler(struct ctl_table *, int,
+extern int numa_nodelist_order_handler(struct ctl_table *, int,
void __user *, size_t *, loff_t *);
-extern char numa_zonelist_order[];
-#define NUMA_ZONELIST_ORDER_LEN 16
+extern char numa_nodelist_order[];
+#define NUMA_NODELIST_ORDER_LEN 16

#ifndef CONFIG_NEED_MULTIPLE_NODES

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 50373984a5e2..040c0c561399 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1648,11 +1648,11 @@ static struct ctl_table vm_table[] = {
#endif
#ifdef CONFIG_NUMA
{
- .procname = "numa_zonelist_order",
- .data = &numa_zonelist_order,
- .maxlen = NUMA_ZONELIST_ORDER_LEN,
+ .procname = "numa_nodelist_order",
+ .data = &numa_nodelist_order,
+ .maxlen = NUMA_NODELIST_ORDER_LEN,
.mode = 0644,
- .proc_handler = numa_zonelist_order_handler,
+ .proc_handler = numa_nodelist_order_handler,
},
#endif
#if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 146abe537300..bc24e614c296 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5479,7 +5479,7 @@ static inline void set_last_nlist_entry(struct nlist_entry *entry)

#ifdef CONFIG_NUMA

-static int __parse_numa_zonelist_order(char *s)
+static int __parse_numa_nodelist_order(char *s)
{
/*
* We used to support different zonlists modes but they turned
@@ -5488,27 +5488,27 @@ static int __parse_numa_zonelist_order(char *s)
* not fail it silently
*/
if (!(*s == 'd' || *s == 'D' || *s == 'n' || *s == 'N')) {
- pr_warn("Ignoring unsupported numa_zonelist_order value: %s\n", s);
+ pr_warn("Ignoring unsupported numa_nodelist_order value: %s\n", s);
return -EINVAL;
}
return 0;
}

-static __init int setup_numa_zonelist_order(char *s)
+static __init int setup_numa_nodelist_order(char *s)
{
if (!s)
return 0;

- return __parse_numa_zonelist_order(s);
+ return __parse_numa_nodelist_order(s);
}
-early_param("numa_zonelist_order", setup_numa_zonelist_order);
+early_param("numa_nodelist_order", setup_numa_nodelist_order);

-char numa_zonelist_order[] = "Node";
+char numa_nodelist_order[] = "Node";

/*
* sysctl handler for numa_zonelist_order
*/
-int numa_zonelist_order_handler(struct ctl_table *table, int write,
+int numa_nodelist_order_handler(struct ctl_table *table, int write,
void __user *buffer, size_t *length,
loff_t *ppos)
{
@@ -5521,7 +5521,7 @@ int numa_zonelist_order_handler(struct ctl_table *table, int write,
if (IS_ERR(str))
return PTR_ERR(str);

- ret = __parse_numa_zonelist_order(str);
+ ret = __parse_numa_nodelist_order(str);
kfree(str);
return ret;
}
--
2.23.0