vmscan: remove unnecessary temporary vars in do_try_to_free_pages (d4debc66) · Commits · 戴 / test

Remove temporary variable that is only used once and does not help clarify code. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by:

Mel Gorman <mel@csn.ul.ie> Reviewed-by:

Rik van Riel <riel@redhat.com> Cc: Dave Chinner <david@fromorbit.com> Cc: Chris Mason <chris.mason@oracle.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Rik van Riel <riel@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Christoph Hellwig <hch@infradead.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Michael Rubin <mrubin@google.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/vmscan.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1728,13 +1728,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;
		/*
		@@ -1779,7 +1778,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		struct reclaim_state *reclaim_state = current->reclaim_state;
		struct zoneref *z;
		struct zone *zone;
		enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
		unsigned long writeback_threshold;

		get_mems_allowed();
		@@ -1799,7 +1797,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		*/
		if (scanning_global_lru(sc)) {
		unsigned long lru_pages = 0;
		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;

Admin message