[PATCH 07/12] vmscan: Remove unnecessary temporary vars in do_try_to_free_pages

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Mel Gorman
Date: Monday, June 14, 2010 - 4:17 am

Remove temporary variable that is only used once and does not help
clarify code.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
---
 mm/vmscan.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 6a42ebc..246e084 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1721,13 +1721,12 @@ static void shrink_zone(int priority, struct zone *zone,
 static bool shrink_zones(int priority, struct zonelist *zonelist,
 					struct scan_control *sc)
 {
-	enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
 	struct zoneref *z;
 	struct zone *zone;
 	bool all_unreclaimable = true;
 
-	for_each_zone_zonelist_nodemask(zone, z, zonelist, high_zoneidx,
-					sc->nodemask) {
+	for_each_zone_zonelist_nodemask(zone, z, zonelist,
+					gfp_zone(sc->gfp_mask), sc->nodemask) {
 		if (!populated_zone(zone))
 			continue;
 		/*
@@ -1773,7 +1772,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
 	unsigned long lru_pages = 0;
 	struct zoneref *z;
 	struct zone *zone;
-	enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
 	unsigned long writeback_threshold;
 
 	get_mems_allowed();
@@ -1785,7 +1783,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
 	 * mem_cgroup will not do shrink_slab.
 	 */
 	if (scanning_global_lru(sc)) {
-		for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
+		for_each_zone_zonelist(zone, z, zonelist, gfp_zone(sc->gfp_mask)) {
 
 			if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
 				continue;
-- 
1.7.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 05/12] vmscan: kill prev_priority completely, Mel Gorman, (Mon Jun 14, 4:17 am)
[PATCH 07/12] vmscan: Remove unnecessary temporary vars in ..., Mel Gorman, (Mon Jun 14, 4:17 am)
[PATCH 11/12] vmscan: Write out dirty pages in batch, Mel Gorman, (Mon Jun 14, 4:17 am)
Re: [PATCH 0/12] Avoid overflowing of stack during page re ..., Christoph Hellwig, (Mon Jun 14, 8:10 am)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, Rik van Riel, (Mon Jun 14, 11:04 am)
Re: [PATCH 06/12] vmscan: simplify shrink_inactive_list(), Rik van Riel, (Mon Jun 14, 11:06 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Andrew Morton, (Mon Jun 14, 4:21 pm)
Re: [PATCH 0/12] Avoid overflowing of stack during page re ..., KAMEZAWA Hiroyuki, (Mon Jun 14, 5:08 pm)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Andrew Morton, (Mon Jun 14, 6:39 pm)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Andrew Morton, (Mon Jun 14, 6:45 pm)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Andrew Morton, (Mon Jun 14, 9:15 pm)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Andrew Morton, (Mon Jun 14, 9:37 pm)
[patch] mm: vmscan fix mapping use after free, Nick Piggin, (Mon Jun 14, 10:43 pm)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Dave Chinner, (Mon Jun 14, 11:36 pm)
Re: [PATCH 08/12] vmscan: Setup pagevec as late as possibl ..., Christoph Hellwig, (Tue Jun 15, 3:47 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Christoph Hellwig, (Tue Jun 15, 3:53 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Christoph Hellwig, (Tue Jun 15, 3:57 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Christoph Hellwig, (Tue Jun 15, 4:01 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Christoph Hellwig, (Tue Jun 15, 4:08 am)
Re: [PATCH 11/12] vmscan: Write out dirty pages in batch, Christoph Hellwig, (Tue Jun 15, 4:10 am)
Re: [patch] mm: vmscan fix mapping use after free, Mel Gorman, (Tue Jun 15, 6:23 am)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, Andrew Morton, (Wed Jun 16, 4:37 pm)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, Rik van Riel, (Wed Jun 16, 4:45 pm)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, Andrew Morton, (Wed Jun 16, 5:18 pm)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, Rik van Riel, (Wed Jun 16, 5:34 pm)
Re: [PATCH 05/12] vmscan: kill prev_priority completely, KOSAKI Motohiro, (Fri Jun 25, 1:29 am)