Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[safe/jmp/linux-2.6] / fs / drop_caches.c

diff --git a/fs/drop_caches.c b/fs/drop_caches.c
index 50f9087..b6a719a 100644 (file)
--- a/fs/drop_caches.c
+++ b/fs/drop_caches.c
@@ -18,7 +18,9 @@ static void drop_pagecache_sb(struct super_block *sb)
 
        spin_lock(&inode_lock);
        list_for_each_entry(inode, &sb->s_inodes, i_sb_list) {
-               if (inode->i_state & (I_FREEING|I_WILL_FREE))
+               if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW))
+                       continue;
+               if (inode->i_mapping->nrpages == 0)
                        continue;
                __iget(inode);
                spin_unlock(&inode_lock);