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

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

[PATCH] zone_reclaim: minor fixes 



- If we only reclaim nr_pages then its okay to stay on node.
  Switch from > to >= for the comparison.

- vm_table[] entry for zone_reclaim_mode is a bit screwed up.

- Add empty lines around shrink_zone to show that this is the
  central function to be called.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52a8363e

kernel/sysctl.c

+2 −1
Original line number Diff line number Diff line
@@ -878,7 +878,8 @@ static ctl_table vm_table[] = { 
		.maxlen		= sizeof(zone_reclaim_mode),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

		.strategy	= &zero,

		.strategy	= &sysctl_intvec,

		.extra1		= &zero,

	},

#endif

	{ .ctl_name = 0 }

mm/vmscan.c

+3 −1
Original line number Diff line number Diff line
@@ -1636,14 +1636,16 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) 
	p->flags |= PF_MEMALLOC;

	reclaim_state.reclaimed_slab = 0;

	p->reclaim_state = &reclaim_state;



	shrink_zone(zone, &sc);



	p->reclaim_state = NULL;

	current->flags &= ~PF_MEMALLOC;



	if (sc.nr_reclaimed == 0)

		zone->last_unsuccessful_zone_reclaim = jiffies;



	return sc.nr_reclaimed > nr_pages;

	return sc.nr_reclaimed >= nr_pages;

}

#endif