Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6bf5270 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] vmscan: no zone_reclaim if PF_MALLOC is set 



If the process has already set PF_MALLOC and is already using
current->reclaim_state then do not try to reclaim memory from the zone.
This is set by kswapd and/or synchrononous global reclaim which will not
take it lightly if we zap the reclaim_state.

Signed-off-by: default avatarChristoph Lameter <clameter@sig.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 04b857f7

mm/vmscan.c

+2 −1
Original line number Diff line number Diff line
@@ -1883,7 +1883,8 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) 


	if (!(gfp_mask & __GFP_WAIT) ||

		zone->all_unreclaimable ||

		atomic_read(&zone->reclaim_in_progress) > 0)

		atomic_read(&zone->reclaim_in_progress) > 0 ||

		(p->flags & PF_MEMALLOC))

			return 0;



	node_id = zone->zone_pgdat->node_id;