Merge tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Linus Torvalds [Mon, 28 May 2012 16:54:45 +0000 (09:54 -0700)]
Pull writeback tree from Wu Fengguang:
 "Mainly from Jan Kara to avoid iput() in the flusher threads."

* tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
  writeback: Avoid iput() from flusher thread
  vfs: Rename end_writeback() to clear_inode()
  vfs: Move waiting for inode writeback from end_writeback() to evict_inode()
  writeback: Refactor writeback_single_inode()
  writeback: Remove wb->list_lock from writeback_single_inode()
  writeback: Separate inode requeueing after writeback
  writeback: Move I_DIRTY_PAGES handling
  writeback: Move requeueing when I_SYNC set to writeback_sb_inodes()
  writeback: Move clearing of I_SYNC into inode_sync_complete()
  writeback: initialize global_dirty_limit
  fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds
  mm: page-writeback.c: local functions should not be exposed globally

17 files changed:
1  2 
fs/autofs4/inode.c
fs/block_dev.c
fs/btrfs/inode.c
fs/cifs/cifsfs.c
fs/ext2/inode.c
fs/ext3/inode.c
fs/ext4/super.c
fs/fuse/inode.c
fs/hugetlbfs/inode.c
fs/inode.c
fs/proc/inode.c
fs/sysfs/inode.c
fs/ubifs/super.c
fs/xfs/xfs_super.c
include/linux/fs.h
ipc/mqueue.c
mm/shmem.c

Simple merge
diff --cc fs/block_dev.c
Simple merge
Simple merge
Simple merge
diff --cc fs/ext2/inode.c
Simple merge
diff --cc fs/ext3/inode.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/proc/inode.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ipc/mqueue.c
Simple merge
diff --cc mm/shmem.c
Simple merge