diff options
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index e8fa2d9eb212..dea7abd31098 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -932,7 +932,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, | |||
| 932 | continue; | 932 | continue; |
| 933 | if (__isolate_lru_page(cursor_page, mode, file) == 0) { | 933 | if (__isolate_lru_page(cursor_page, mode, file) == 0) { |
| 934 | list_move(&cursor_page->lru, dst); | 934 | list_move(&cursor_page->lru, dst); |
| 935 | mem_cgroup_del_lru(page); | 935 | mem_cgroup_del_lru(cursor_page); |
| 936 | nr_taken++; | 936 | nr_taken++; |
| 937 | scan++; | 937 | scan++; |
| 938 | } | 938 | } |
| @@ -1104,7 +1104,7 @@ static unsigned long shrink_inactive_list(unsigned long max_scan, | |||
| 1104 | */ | 1104 | */ |
| 1105 | if (nr_freed < nr_taken && !current_is_kswapd() && | 1105 | if (nr_freed < nr_taken && !current_is_kswapd() && |
| 1106 | lumpy_reclaim) { | 1106 | lumpy_reclaim) { |
| 1107 | congestion_wait(WRITE, HZ/10); | 1107 | congestion_wait(BLK_RW_ASYNC, HZ/10); |
| 1108 | 1108 | ||
| 1109 | /* | 1109 | /* |
| 1110 | * The attempt at page out may have made some | 1110 | * The attempt at page out may have made some |
| @@ -1721,7 +1721,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, | |||
| 1721 | 1721 | ||
| 1722 | /* Take a nap, wait for some writeback to complete */ | 1722 | /* Take a nap, wait for some writeback to complete */ |
| 1723 | if (sc->nr_scanned && priority < DEF_PRIORITY - 2) | 1723 | if (sc->nr_scanned && priority < DEF_PRIORITY - 2) |
| 1724 | congestion_wait(WRITE, HZ/10); | 1724 | congestion_wait(BLK_RW_ASYNC, HZ/10); |
| 1725 | } | 1725 | } |
| 1726 | /* top priority shrink_zones still had more to do? don't OOM, then */ | 1726 | /* top priority shrink_zones still had more to do? don't OOM, then */ |
| 1727 | if (!sc->all_unreclaimable && scanning_global_lru(sc)) | 1727 | if (!sc->all_unreclaimable && scanning_global_lru(sc)) |
| @@ -1960,7 +1960,7 @@ loop_again: | |||
| 1960 | * another pass across the zones. | 1960 | * another pass across the zones. |
| 1961 | */ | 1961 | */ |
| 1962 | if (total_scanned && priority < DEF_PRIORITY - 2) | 1962 | if (total_scanned && priority < DEF_PRIORITY - 2) |
| 1963 | congestion_wait(WRITE, HZ/10); | 1963 | congestion_wait(BLK_RW_ASYNC, HZ/10); |
| 1964 | 1964 | ||
| 1965 | /* | 1965 | /* |
| 1966 | * We do this so kswapd doesn't build up large priorities for | 1966 | * We do this so kswapd doesn't build up large priorities for |
| @@ -2233,7 +2233,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages) | |||
| 2233 | goto out; | 2233 | goto out; |
| 2234 | 2234 | ||
| 2235 | if (sc.nr_scanned && prio < DEF_PRIORITY - 2) | 2235 | if (sc.nr_scanned && prio < DEF_PRIORITY - 2) |
| 2236 | congestion_wait(WRITE, HZ / 10); | 2236 | congestion_wait(BLK_RW_ASYNC, HZ / 10); |
| 2237 | } | 2237 | } |
| 2238 | } | 2238 | } |
| 2239 | 2239 | ||
