Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2013 21:21:44 +0000 (13:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2013 21:21:44 +0000 (13:21 -0800)
Pull writeback fixes from Wu Fengguang:
 "Two writeback fixes

   - fix negative (setpoint - dirty) in 32bit archs

   - use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"

* tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  Negative (setpoint-dirty) in bdi_position_ratio()
  vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them

1  2 
fs/btrfs/extent-tree.c
fs/ext4/inode.c
fs/fs-writeback.c
mm/page-writeback.c

Simple merge
diff --cc fs/ext4/inode.c
Simple merge
Simple merge
Simple merge