[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20080312140447.GC6072@csn.ul.ie>
Date: Wed, 12 Mar 2008 14:04:47 +0000
From: Mel Gorman <mel@....ul.ie>
To: Hugh Dickins <hugh@...itas.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Balbir Singh <balbir@...ux.vnet.ibm.com>,
Pavel Emelyanov <xemul@...nvz.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH rc5-mm1 3/3] do_try_to_free_pages gfp_mask redundant
On (11/03/08 21:16), Hugh Dickins didst pronounce:
> do_try_to_free_pages is taking both a gfp_mask and an sc->gfp_mask,
> sometimes one used and sometimes the other; at present they're always
> identical, but such duplication begs for trouble: remove gfp_mask arg.
>
> Signed-off-by: Hugh Dickins <hugh@...itas.com>
Acked-by: Mel Gorman <mel@....ul.ie>
> ---
>
> mm/vmscan.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> --- 2.6.25-rc5-mm1++/mm/vmscan.c 2008-03-11 20:15:47.000000000 +0000
> +++ linux/mm/vmscan.c 2008-03-11 20:21:14.000000000 +0000
> @@ -1324,7 +1324,7 @@ static unsigned long shrink_zones(int pr
> * allocation attempt will fail.
> */
> static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
> - gfp_t gfp_mask, struct scan_control *sc)
> + struct scan_control *sc)
> {
> int priority;
> int ret = 0;
> @@ -1334,7 +1334,7 @@ static unsigned long do_try_to_free_page
> unsigned long lru_pages = 0;
> struct zoneref *z;
> struct zone *zone;
> - enum zone_type high_zoneidx = gfp_zone(gfp_mask);
> + enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
>
> if (scan_global_lru(sc))
> count_vm_event(ALLOCSTALL);
> @@ -1363,7 +1363,7 @@ static unsigned long do_try_to_free_page
> * over limit cgroups
> */
> if (scan_global_lru(sc)) {
> - shrink_slab(sc->nr_scanned, gfp_mask, lru_pages);
> + shrink_slab(sc->nr_scanned, sc->gfp_mask, lru_pages);
> if (reclaim_state) {
> nr_reclaimed += reclaim_state->reclaimed_slab;
> reclaim_state->reclaimed_slab = 0;
> @@ -1435,7 +1435,7 @@ unsigned long try_to_free_pages(struct z
> .isolate_pages = isolate_pages_global,
> };
>
> - return do_try_to_free_pages(zonelist, gfp_mask, &sc);
> + return do_try_to_free_pages(zonelist, &sc);
> }
>
> #ifdef CONFIG_CGROUP_MEM_RES_CTLR
> @@ -1457,7 +1457,7 @@ unsigned long try_to_free_mem_cgroup_pag
> sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
> (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK);
> zonelist = NODE_DATA(numa_node_id())->node_zonelists;
> - return do_try_to_free_pages(zonelist, sc.gfp_mask, &sc);
> + return do_try_to_free_pages(zonelist, &sc);
> }
> #endif
>
>
--
Mel Gorman
Part-time Phd Student Linux Technology Center
University of Limerick IBM Dublin Software Lab
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists