diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2016-05-05 15:21:14 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2016-05-05 15:21:14 -0400 |
| commit | ef1d88ced108df7d652cf3f514b920e661826b71 (patch) | |
| tree | fe18b0d5c61b0371b9573c58973e459b10ebeb21 /mm/page-writeback.c | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
| parent | 0ef5a50c1658d4d96a44f145bcb92ff3310c75b1 (diff) | |
Merge remote-tracking branch 'jens/for-4.7/core' into dm-4.7
Needed in order to update the DM thinp code to use the new async
__blkdev_issue_discard() interface.
Diffstat (limited to 'mm/page-writeback.c')
| -rw-r--r-- | mm/page-writeback.c | 6 |
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; } |