Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Wed, 27 Oct 2010 00:58:44 +0000 (17:58 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  split invalidate_inodes()
  fs: skip I_FREEING inodes in writeback_sb_inodes
  fs: fold invalidate_list into invalidate_inodes
  fs: do not drop inode_lock in dispose_list
  fs: inode split IO and LRU lists
  fs: switch bdev inode bdi's correctly
  fs: fix buffer invalidation in invalidate_list
  fsnotify: use dget_parent
  smbfs: use dget_parent
  exportfs: use dget_parent
  fs: use RCU read side protection in d_validate
  fs: clean up dentry lru modification
  fs: split __shrink_dcache_sb
  fs: improve DCACHE_REFERENCED usage
  fs: use percpu counter for nr_dentry and nr_dentry_unused
  fs: simplify __d_free
  fs: take dcache_lock inside __d_path
  fs: do not assign default i_ino in new_inode
  fs: introduce a per-cpu last_ino allocator
  new helper: ihold()
  ...

12 files changed:
1  2 
fs/buffer.c
fs/fs-writeback.c
fs/hugetlbfs/inode.c
fs/inode.c
fs/nfs/dir.c
fs/proc/base.c
fs/reiserfs/inode.c
include/linux/fs.h
include/linux/writeback.h
kernel/sysctl.c
mm/backing-dev.c
net/socket.c

diff --cc fs/buffer.c
Simple merge
@@@ -721,13 -724,9 +724,13 @@@ static long wb_check_old_data_flush(str
                return 0;
  
        wb->last_old_flush = jiffies;
 +      /*
 +       * Add in the number of potentially dirty inodes, because each inode
 +       * write can dirty pagecache in the underlying blockdev.
 +       */
        nr_pages = global_page_state(NR_FILE_DIRTY) +
                        global_page_state(NR_UNSTABLE_NFS) +
-                       (inodes_stat.nr_inodes - inodes_stat.nr_unused);
+                       get_nr_dirty_inodes();
  
        if (nr_pages) {
                struct wb_writeback_work work = {
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/nfs/dir.c
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge