aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorStefan Guendhoer <stefan@guendhoer.com>2016-01-07 19:54:24 +0000
committerMoyster <oysterized@gmail.com>2016-08-26 19:59:33 +0200
commitbdf9c7f55917834cd51f0e8fde823534f13d784d (patch)
tree78d136d6f77aa198b1ea730f265ebb7ca7c2d34c /mm
parente815a4d9963c5376ba05a64c3ce23dae279b3b96 (diff)
downloadandroid_kernel_m2note-bdf9c7f55917834cd51f0e8fde823534f13d784d.tar.gz
mm, vmscan: Do not wait for page writeback for GFP_NOFS
Diffstat (limited to 'mm')
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 02a5164d0..146805243 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -893,7 +893,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
/* Case 2 above */
} else if (global_reclaim(sc) ||
- !PageReclaim(page) || !(sc->gfp_mask & __GFP_IO)) {
+ !PageReclaim(page) || !may_enter_fs) {
/*
* This is slightly racy - end_page_writeback()
* might have just cleared PageReclaim, then