diff options
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index c26986c85ce0..96ebe6608d5c 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -2060,9 +2060,6 @@ loop_again: | |||
| 2060 | priority != DEF_PRIORITY) | 2060 | priority != DEF_PRIORITY) |
| 2061 | continue; | 2061 | continue; |
| 2062 | 2062 | ||
| 2063 | if (!zone_watermark_ok(zone, order, | ||
| 2064 | high_wmark_pages(zone), end_zone, 0)) | ||
| 2065 | all_zones_ok = 0; | ||
| 2066 | temp_priority[i] = priority; | 2063 | temp_priority[i] = priority; |
| 2067 | sc.nr_scanned = 0; | 2064 | sc.nr_scanned = 0; |
| 2068 | note_zone_scanning_priority(zone, priority); | 2065 | note_zone_scanning_priority(zone, priority); |
| @@ -2102,13 +2099,18 @@ loop_again: | |||
| 2102 | total_scanned > sc.nr_reclaimed + sc.nr_reclaimed / 2) | 2099 | total_scanned > sc.nr_reclaimed + sc.nr_reclaimed / 2) |
| 2103 | sc.may_writepage = 1; | 2100 | sc.may_writepage = 1; |
| 2104 | 2101 | ||
| 2105 | /* | 2102 | if (!zone_watermark_ok(zone, order, |
| 2106 | * We are still under min water mark. it mean we have | 2103 | high_wmark_pages(zone), end_zone, 0)) { |
| 2107 | * GFP_ATOMIC allocation failure risk. Hurry up! | 2104 | all_zones_ok = 0; |
| 2108 | */ | 2105 | /* |
| 2109 | if (!zone_watermark_ok(zone, order, min_wmark_pages(zone), | 2106 | * We are still under min water mark. This |
| 2110 | end_zone, 0)) | 2107 | * means that we have a GFP_ATOMIC allocation |
| 2111 | has_under_min_watermark_zone = 1; | 2108 | * failure risk. Hurry up! |
| 2109 | */ | ||
| 2110 | if (!zone_watermark_ok(zone, order, | ||
| 2111 | min_wmark_pages(zone), end_zone, 0)) | ||
| 2112 | has_under_min_watermark_zone = 1; | ||
| 2113 | } | ||
| 2112 | 2114 | ||
| 2113 | } | 2115 | } |
| 2114 | if (all_zones_ok) | 2116 | if (all_zones_ok) |