From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Oct 2010 00:58:44 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v2.6.37-rc1~94
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=426e1f5cec4821945642230218876b0e89aafab1;p=karo-tx-linux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* '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()
  ...
---

426e1f5cec4821945642230218876b0e89aafab1
diff --cc fs/fs-writeback.c
index 9e46aec10d1a,f6af81add459..aed881a76b22
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@@ -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 = {