UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2011-11-07 09:59:02 -08:00
parent ff4d7fa8c3 3a73dbbc9b
commit 6e6bc67982
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/page-writeback.c
View File

@ -1097,13 +1097,13 @@ static void balance_dirty_pages(struct address_space *mapping,
pos_ratio = bdi_position_ratio(bdi, dirty_thresh, pos_ratio = bdi_position_ratio(bdi, dirty_thresh,
background_thresh, nr_dirty, background_thresh, nr_dirty,
bdi_thresh, bdi_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; pause = max_pause;
goto pause; goto pause;
} }
task_ratelimit = (u64)dirty_ratelimit * pause = HZ * pages_dirtied / task_ratelimit;
pos_ratio >> RATELIMIT_CALC_SHIFT;
pause = (HZ * pages_dirtied) / (task_ratelimit | 1);
if (unlikely(pause <= 0)) { if (unlikely(pause <= 0)) {
trace_balance_dirty_pages(bdi, trace_balance_dirty_pages(bdi,
dirty_thresh, dirty_thresh,