summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-06 13:08:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-06 13:08:35 -0700
commit07837831047fb72856d1f61a726a4094397facd8 (patch)
treeb4a0e4d8486969c8c1123b1d3399812a19d62eaa
parent3f86ba5d0c1c34a4469da1f62d3707e32a20d6ba (diff)
parent74d369443325063a5f0260e63971decb950fd8fa (diff)
downloadlinux-stable-07837831047fb72856d1f61a726a4094397facd8.tar.gz
linux-stable-07837831047fb72856d1f61a726a4094397facd8.tar.bz2
linux-stable-07837831047fb72856d1f61a726a4094397facd8.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull writeback fix from Jens Axboe: "Just a single fix for domain aware writeback, fixing a regression that can cause balance_dirty_pages() to keep looping while not getting any work done" * 'for-linus' of git://git.kernel.dk/linux-block: writeback: Fix performance regression in wb_over_bg_thresh()
-rw-r--r--mm/page-writeback.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 999792d35ccc..bc5149d5ec38 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1910,7 +1910,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
if (gdtc->dirty > gdtc->bg_thresh)
return true;
- if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(gdtc))
+ if (wb_stat(wb, WB_RECLAIMABLE) >
+ wb_calc_thresh(gdtc->wb, gdtc->bg_thresh))
return true;
if (mdtc) {
@@ -1924,7 +1925,8 @@ bool wb_over_bg_thresh(struct bdi_writeback *wb)
if (mdtc->dirty > mdtc->bg_thresh)
return true;
- if (wb_stat(wb, WB_RECLAIMABLE) > __wb_calc_thresh(mdtc))
+ if (wb_stat(wb, WB_RECLAIMABLE) >
+ wb_calc_thresh(mdtc->wb, mdtc->bg_thresh))
return true;
}