diff --git a/[refs] b/[refs] index fddb5df96d05..c0c97b7e70aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d4eb36679adbdd75495e1bbfe7ac40e4ae41dea +refs/heads/master: 99a38919241fd051b8d93b2e4d0c05ef0556d795 diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c index 2cd2e48f7a20..4bedac32154f 100644 --- a/trunk/fs/inode.c +++ b/trunk/fs/inode.c @@ -28,7 +28,6 @@ /* * This is needed for the following functions: * - inode_has_buffers - * - invalidate_inode_buffers * - invalidate_bdev * * FIXME: remove all knowledge of the buffer layer from this file @@ -503,16 +502,15 @@ static int invalidate_list(struct list_head *head, struct list_head *dispose) inode = list_entry(tmp, struct inode, i_sb_list); if (inode->i_state & I_NEW) continue; - invalidate_inode_buffers(inode); - if (!atomic_read(&inode->i_count)) { - list_move(&inode->i_list, dispose); - WARN_ON(inode->i_state & I_NEW); - inode->i_state |= I_FREEING; - if (!(inode->i_state & (I_DIRTY | I_SYNC))) - percpu_counter_dec(&nr_inodes_unused); + if (atomic_read(&inode->i_count)) { + busy = 1; continue; } - busy = 1; + + list_move(&inode->i_list, dispose); + inode->i_state |= I_FREEING; + if (!(inode->i_state & (I_DIRTY | I_SYNC))) + percpu_counter_dec(&nr_inodes_unused); } return busy; }