diff options
| author | Linus Torvalds | 2011-11-07 04:02:23 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-07 04:02:23 +0100 |
| commit | 208bca0860406d16398145ddd950036a737c3c9d (patch) | |
| tree | 7797a16c17d8bd155120126fa7976727fc6de013 /mm/vmscan.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/... (diff) | |
| parent | writeback: Add a 'reason' to wb_writeback_work (diff) | |
| download | kernel-qcow2-linux-208bca0860406d16398145ddd950036a737c3c9d.tar.gz kernel-qcow2-linux-208bca0860406d16398145ddd950036a737c3c9d.tar.xz kernel-qcow2-linux-208bca0860406d16398145ddd950036a737c3c9d.zip | |
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
* 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Add a 'reason' to wb_writeback_work
writeback: send work item to queue_io, move_expired_inodes
writeback: trace event balance_dirty_pages
writeback: trace event bdi_dirty_ratelimit
writeback: fix ppc compile warnings on do_div(long long, unsigned long)
writeback: per-bdi background threshold
writeback: dirty position control - bdi reserve area
writeback: control dirty pause time
writeback: limit max dirty pause time
writeback: IO-less balance_dirty_pages()
writeback: per task dirty rate limit
writeback: stabilize bdi->dirty_ratelimit
writeback: dirty rate control
writeback: add bg_threshold parameter to __bdi_update_bandwidth()
writeback: dirty position control
writeback: account per-bdi accumulated dirtied pages
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 132d1ddb2238..a1893c050795 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2266,7 +2266,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, */ writeback_threshold = sc->nr_to_reclaim + sc->nr_to_reclaim / 2; if (total_scanned > writeback_threshold) { - wakeup_flusher_threads(laptop_mode ? 0 : total_scanned); + wakeup_flusher_threads(laptop_mode ? 0 : total_scanned, + WB_REASON_TRY_TO_FREE_PAGES); sc->may_writepage = 1; } |