Skip to contentSkip to conversation

mm/: small cleanups

PATCH In review Adrian Bunk 2 participants 4 messages Oct 30, 2005 – Nov 7, 2005

Subsystems (5)
Memory management Page allocator MGLRU MM reclaim +1 more subsystems
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 mm/: small cleanups

This patch contains the following cleanups:
- make some needlessly global functions static
- vmscan.c: #if 0 the unused global function sys_set_zone_reclaim

Signed-off-by Adrian Bunk <[email protected]>

---

 mm/page_alloc.c |   12 +++++++-----
 mm/vmalloc.c    |   12 +++++++-----
 mm/vmscan.c     |    3 +++
 3 files changed, 17 insertions(+), 10 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c.old +7 -5
@@ -393,7 +393,7 @@
 	return ret;
 }
 
-void __free_pages_ok(struct page *page, unsigned int order)
+static void __free_pages_ok(struct page *page, unsigned int order)
 {
 	LIST_HEAD(list);
 	int i;

@@ -1228,7 +1228,8 @@
 DEFINE_PER_CPU(long, nr_pagecache_local) = 0;
 #endif
 
-void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask)
+static void __get_page_state(struct page_state *ret, int nr,
+			     cpumask_t *cpumask)
 {
 	int cpu = 0;
 

@@ -1786,8 +1787,8 @@
 	}
 }
 
-void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,
-				unsigned long size)
+static void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,
+				 unsigned long size)
 {
 	int order;
 	for (order = 0; order < MAX_ORDER ; order++) {

@@ -1847,7 +1848,8 @@
 	return batch;
 }
 
-inline void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
+static inline void setup_pageset(struct per_cpu_pageset *p,
+				 unsigned long batch)
 {
 	struct per_cpu_pages *pcp;
mm/vmscan.c renamed from mm/vmscan.c.old +3 -0
@@ -1387,6 +1387,7 @@
 	return total_reclaimed;
 }
 
+#if 0
 asmlinkage long sys_set_zone_reclaim(unsigned int node, unsigned int zone,
 				     unsigned int state)
 {

@@ -1417,3 +1418,5 @@
 
 	return 0;
 }
+#endif  /*  0  */
+
mm/vmalloc.c renamed from mm/vmalloc.c.old +7 -5
@@ -157,8 +157,10 @@
 	return err;
 }
 
-struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long flags,
-				unsigned long start, unsigned long end, int node)
+static struct vm_struct *__get_vm_area_node(unsigned long size,
+					    unsigned long flags,
+					    unsigned long start,
+					    unsigned long end, int node)
 {
 	struct vm_struct **p, *tmp, *area;
 	unsigned long align = 1;

@@ -296,7 +298,7 @@
 	return v;
 }
 
-void __vunmap(void *addr, int deallocate_pages)
+static void __vunmap(void *addr, int deallocate_pages)
 {
 	struct vm_struct *area;
 

@@ -402,8 +404,8 @@
 }
 EXPORT_SYMBOL(vmap);
 
-void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
-				pgprot_t prot, int node)
+static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+				 pgprot_t prot, int node)
 {
 	struct page **pages;
 	unsigned int nr_pages, array_size, i;
#1 lore raw
Quoted 3 lines · Adrian Bunk

This patch contains the following cleanups:
- make some needlessly global functions static
- vmscan.c: #if 0 the unused global function sys_set_zone_reclaim

If it's truly unused, why not simply kill it completely?

-- Dave

author
#2 lore raw

PATCH 1/1 mm/: small cleanups

Quoted 6 lines · Dave Hansen
Quoted 3 lines · Adrian Bunk

This patch contains the following cleanups:
- make some needlessly global functions static
- vmscan.c: #if 0 the unused global function sys_set_zone_reclaim

If it's truly unused, why not simply kill it completely?

Updated patch below.

Quoted 1 line

-- Dave

cu
Adrian

<-- snip -->

This patch contains the following cleanups:
- make some needlessly global functions static
- vmscan.c: remove the unused global function sys_set_zone_reclaim

Signed-off-by Adrian Bunk <[email protected]>

---

 mm/page_alloc.c |   12 +++++++-----
 mm/vmalloc.c    |   13 +++++++------
 mm/vmscan.c     |   30 ------------------------------
 3 files changed, 14 insertions(+), 41 deletions(-)
mm/page_alloc.c renamed from mm/page_alloc.c.old +7 -5
@@ -393,7 +393,7 @@
 	return ret;
 }
 
-void __free_pages_ok(struct page *page, unsigned int order)
+static void __free_pages_ok(struct page *page, unsigned int order)
 {
 	LIST_HEAD(list);
 	int i;

@@ -1228,7 +1228,8 @@
 DEFINE_PER_CPU(long, nr_pagecache_local) = 0;
 #endif
 
-void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask)
+static void __get_page_state(struct page_state *ret, int nr,
+			     cpumask_t *cpumask)
 {
 	int cpu = 0;
 

@@ -1786,8 +1787,8 @@
 	}
 }
 
-void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,
-				unsigned long size)
+static void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,
+				 unsigned long size)
 {
 	int order;
 	for (order = 0; order < MAX_ORDER ; order++) {

@@ -1847,7 +1848,8 @@
 	return batch;
 }
 
-inline void setup_pageset(struct per_cpu_pageset *p, unsigned long batch)
+static inline void setup_pageset(struct per_cpu_pageset *p,
+				 unsigned long batch)
 {
 	struct per_cpu_pages *pcp;
mm/vmalloc.c renamed from mm/vmalloc.c.old +7 -5
@@ -157,8 +157,10 @@
 	return err;
 }
 
-struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long flags,
-				unsigned long start, unsigned long end, int node)
+static struct vm_struct *__get_vm_area_node(unsigned long size,
+					    unsigned long flags,
+					    unsigned long start,
+					    unsigned long end, int node)
 {
 	struct vm_struct **p, *tmp, *area;
 	unsigned long align = 1;

@@ -296,7 +298,7 @@
 	return v;
 }
 
-void __vunmap(void *addr, int deallocate_pages)
+static void __vunmap(void *addr, int deallocate_pages)
 {
 	struct vm_struct *area;
 

@@ -402,8 +404,8 @@
 }
 EXPORT_SYMBOL(vmap);
 
-void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
-				pgprot_t prot, int node)
+static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+				 pgprot_t prot, int node)
 {
 	struct page **pages;
 	unsigned int nr_pages, array_size, i;
mm/vmscan.c renamed from mm/vmscan.c.old +0 -30
@@ -1605,33 +1605,3 @@
 	return total_reclaimed;
 }
 
-asmlinkage long sys_set_zone_reclaim(unsigned int node, unsigned int zone,
-				     unsigned int state)
-{
-	struct zone *z;
-	int i;
-
-	if (!capable(CAP_SYS_ADMIN))
-		return -EACCES;
-
-	if (node >= MAX_NUMNODES || !node_online(node))
-		return -EINVAL;
-
-	/* This will break if we ever add more zones */
-	if (!(zone & (1<<ZONE_DMA|1<<ZONE_NORMAL|1<<ZONE_HIGHMEM)))
-		return -EINVAL;
-
-	for (i = 0; i < MAX_NR_ZONES; i++) {
-		if (!(zone & 1<<i))
-			continue;
-
-		z = &NODE_DATA(node)->node_zones[i];
-
-		if (state)
-			z->reclaim_pages = 1;
-		else
-			z->reclaim_pages = 0;
-	}
-
-	return 0;
-}
#3 lore raw
Quoted 9 lines · Adrian Bunk
Quoted 6 lines · Dave Hansen
Quoted 3 lines · Adrian Bunk

This patch contains the following cleanups:
- make some needlessly global functions static
- vmscan.c: #if 0 the unused global function sys_set_zone_reclaim

If it's truly unused, why not simply kill it completely?

Updated patch below.

Looks better now. The net removal of 27 lines makes it much easier to sell as a cleanup. :)

-- Dave