Skip to content

Commit

Permalink
[PATCH] zone_reclaim: minor fixes
Browse files Browse the repository at this point in the history
- 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: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Feb 1, 2006
1 parent 52a8363 commit c84db23
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion kernel/sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 3 additions & 1 deletion mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c84db23

Please sign in to comment.