Merge "mm: vmscan: remove old flusher wakeup from direct reclaim path" (85b22ad5) · Commits · e / devices / android_kernel_fairphone_FP3

mm/vmscan.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -2821,8 +2821,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		struct scan_control *sc)
		{
		int initial_priority = sc->priority;
		unsigned long total_scanned = 0;
		unsigned long writeback_threshold;
		retry:
		delayacct_freepages_start();

		@@ -2835,7 +2833,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		sc->nr_scanned = 0;
		shrink_zones(zonelist, sc);

		total_scanned += sc->nr_scanned;
		if (sc->nr_reclaimed >= sc->nr_to_reclaim)
		break;

		@@ -2848,20 +2845,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		*/
		if (sc->priority < DEF_PRIORITY - 2)
		sc->may_writepage = 1;

		/*
		* Try to write back as many pages as we just scanned. This
		* tends to cause slow streaming writers to write data to the
		* disk smoothly, at the dirtying rate, which is nice. But
		* that's undesirable in laptop mode, where we want lumpy
		* writeout. So in laptop mode, write out the whole world.
		*/
		writeback_threshold = sc->nr_to_reclaim + sc->nr_to_reclaim / 2;
		if (total_scanned > writeback_threshold) {
		wakeup_flusher_threads(laptop_mode ? 0 : total_scanned,
		WB_REASON_VMSCAN);
		sc->may_writepage = 1;
		}
		} while (--sc->priority >= 0);

		delayacct_freepages_end();