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

Commit 6e6bc679 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux

* 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  writeback: fix uninitialized task_ratelimit
parents ff4d7fa8 3a73dbbc
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1097,13 +1097,13 @@ static void balance_dirty_pages(struct address_space *mapping,
		pos_ratio = bdi_position_ratio(bdi, dirty_thresh,
					       background_thresh, nr_dirty,
					       bdi_thresh, bdi_dirty);
		if (unlikely(pos_ratio == 0)) {
		task_ratelimit = ((u64)dirty_ratelimit * pos_ratio) >>
							RATELIMIT_CALC_SHIFT;
		if (unlikely(task_ratelimit == 0)) {
			pause = max_pause;
			goto pause;
		}
		task_ratelimit = (u64)dirty_ratelimit *
					pos_ratio >> RATELIMIT_CALC_SHIFT;
		pause = (HZ * pages_dirtied) / (task_ratelimit | 1);
		pause = HZ * pages_dirtied / task_ratelimit;
		if (unlikely(pause <= 0)) {
			trace_balance_dirty_pages(bdi,
						  dirty_thresh,