Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Fri, 25 Sep 2009 16:27:30 +0000 (09:27 -0700)]
* 'writeback' of git://git.kernel.dk/linux-2.6-block:
  writeback: writeback_inodes_sb() should use bdi_start_writeback()
  writeback: don't delay inodes redirtied by a fast dirtier
  writeback: make the super_block pinning more efficient
  writeback: don't resort for a single super_block in move_expired_inodes()
  writeback: move inodes from one super_block together
  writeback: get rid to incorrect references to pdflush in comments
  writeback: improve readability of the wb_writeback() continue/break logic
  writeback: cleanup writeback_single_inode()
  writeback: kupdate writeback shall not stop when more io is possible
  writeback: stop background writeback when below background threshold
  writeback: balance_dirty_pages() shall write more than dirtied pages
  fs: Fix busyloop in wb_writeback()

1  2 
fs/buffer.c
mm/page-writeback.c
mm/shmem.c
mm/vmscan.c

diff --cc fs/buffer.c
@@@ -277,10 -272,9 +277,10 @@@ void invalidate_bdev(struct block_devic
        invalidate_bh_lrus();
        invalidate_mapping_pages(mapping, 0, -1);
  }
 +EXPORT_SYMBOL(invalidate_bdev);
  
  /*
-  * Kick pdflush then try to free up some ZONE_NORMAL memory.
+  * Kick the writeback threads then try to free up some ZONE_NORMAL memory.
   */
  static void free_more_memory(void)
  {
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/vmscan.c
Simple merge