Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07837831 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 3f86ba5d 74d36944

mm/page-writeback.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}