>
> Reported-by: John Berthels <john@humyo.com>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> mm/vmscan.c | 13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index e0e5f15..5321ac4 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -1826,10 +1826,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
> * writeout. So in laptop mode, write out the whole world.
> */
> writeback_threshold = sc->nr_to_reclaim + sc->nr_to_reclaim / 2;
> - if (total_scanned > writeback_threshold) {
> + if (total_scanned > writeback_threshold)
> wakeup_flusher_threads(laptop_mode ? 0 : total_scanned);
> - sc->may_writepage = 1;
> - }
>
> /* Take a nap, wait for some writeback to complete */
> if (!sc->hibernation_mode && sc->nr_scanned &&
> @@ -1871,7 +1869,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
> {
> struct scan_control sc = {
> .gfp_mask = gfp_mask,
> - .may_writepage = !laptop_mode,
> + .may_writepage = 0,
> .nr_to_reclaim = SWAP_CLUSTER_MAX,
> .may_unmap = 1,
> .may_swap = 1,
> @@ -1893,7 +1891,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
> struct zone *zone, int nid)
> {
> struct scan_control sc = {
> - .may_writepage = !laptop_mode,
> + .may_writepage = 0,
> .may_unmap = 1,
> .may_swap = !noswap,
> .swappiness = swappiness,
> @@ -1926,7 +1924,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
> {
> struct zonelist *zonelist;
> struct scan_control sc = {
> - .may_writepage = !laptop_mode,
> + .may_writepage = 0,
> .may_unmap = 1,
> .may_swap = !noswap,
> .nr_to_reclaim = SWAP_CLUSTER_MAX,
> @@ -2567,7 +2565,8 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
> struct reclaim_state reclaim_state;
> int priority;
> struct scan_control sc = {
> - .may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
> + .may_writepage = (current_is_kswapd() &&
> + (zone_reclaim_mode & RECLAIM_WRITE)),
> .may_unmap = !!(zone_reclaim_mode & RECLAIM_SWAP),
> .may_swap = 1,
> .nr_to_reclaim = max_t(unsigned long, nr_pages,
> --
> 1.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at
http://www.tux.org/lkml/