diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:02:23 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:02:23 -0800 | 
| commit | 208bca0860406d16398145ddd950036a737c3c9d (patch) | |
| tree | 7797a16c17d8bd155120126fa7976727fc6de013 /fs/buffer.c | |
| parent | 6aad3738f6a79fd0ca480eaceefe064cc471f6eb (diff) | |
| parent | 0e175a1835ffc979e55787774e58ec79e41957d7 (diff) | |
| download | olio-linux-3.10-208bca0860406d16398145ddd950036a737c3c9d.tar.xz olio-linux-3.10-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 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 70a19745cb6..19d8eb7fdc8 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -288,7 +288,7 @@ static void free_more_memory(void)  	struct zone *zone;  	int nid; -	wakeup_flusher_threads(1024); +	wakeup_flusher_threads(1024, WB_REASON_FREE_MORE_MEM);  	yield();  	for_each_online_node(nid) {  |