Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-block.git] / mm / page-writeback.c

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 3b88795ab46e1a70752990bf4ce7da925d97908c..b9956fdee8f5d0ed55713eef51e13a6ea42b2e0d 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -411,8 +411,8 @@ static void domain_dirty_limits(struct dirty_throttle_control *dtc)
                bg_thresh = thresh / 2;
        tsk = current;
        if (tsk->flags & PF_LESS_THROTTLE || rt_task(tsk)) {
-               bg_thresh += bg_thresh / 4;
-               thresh += thresh / 4;
+               bg_thresh += bg_thresh / 4 + global_wb_domain.dirty_limit / 32;
+               thresh += thresh / 4 + global_wb_domain.dirty_limit / 32;
        }
        dtc->thresh = thresh;
        dtc->bg_thresh = bg_thresh;