diff options
| author | Christoph Lameter | 2006-02-01 12:05:28 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-02-01 17:53:15 +0100 |
| commit | 52a8363eae3872af15880292ff4e06d0fab36986 (patch) | |
| tree | 9ac9d0f00cc2e35e5d95c7be77874477e25847b4 /mm/vmscan.c | |
| parent | [PATCH] GFP_ZONETYPES: calculate from GFP_ZONEMASK (diff) | |
| download | kernel-qcow2-linux-52a8363eae3872af15880292ff4e06d0fab36986.tar.gz kernel-qcow2-linux-52a8363eae3872af15880292ff4e06d0fab36986.tar.xz kernel-qcow2-linux-52a8363eae3872af15880292ff4e06d0fab36986.zip | |
[PATCH] mm: improve function of sc->may_writepage
Make sc->may_writepage control the writeout behavior of shrink_list.
Remove the laptop_mode trick from shrink_list and instead set may_writepage
in try_to_free_pages properly.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 0ca6007d655b..a29efb2c06c8 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -492,7 +492,7 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc) goto keep_locked; if (!may_enter_fs) goto keep_locked; - if (laptop_mode && !sc->may_writepage) + if (!sc->may_writepage) goto keep_locked; /* Page is dirty, try to write it out here */ @@ -1170,7 +1170,7 @@ int try_to_free_pages(struct zone **zones, gfp_t gfp_mask) int i; sc.gfp_mask = gfp_mask; - sc.may_writepage = 0; + sc.may_writepage = !laptop_mode; sc.may_swap = 1; inc_page_state(allocstall); @@ -1273,7 +1273,7 @@ loop_again: total_scanned = 0; total_reclaimed = 0; sc.gfp_mask = GFP_KERNEL; - sc.may_writepage = 0; + sc.may_writepage = !laptop_mode; sc.may_swap = 1; sc.nr_mapped = read_page_state(nr_mapped); |