diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-10-23 19:07:20 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-25 21:26:14 -0400 |
| commit | 99a38919241fd051b8d93b2e4d0c05ef0556d795 (patch) | |
| tree | 6d42602c4663645412e3c11dc31211a28b285594 /fs | |
| parent | 4d4eb36679adbdd75495e1bbfe7ac40e4ae41dea (diff) | |
fs: fix buffer invalidation in invalidate_list
We must not call invalidate_inode_buffers in invalidate_list unless the
inode can be reclaimed. If we remove the buffer association of a busy
inode fsync won't find the buffers anymore. As invalidate_inode_buffers
is called from various others sources than umount this actually does
matter in practice.
While at it change the loop to a more natural form and remove the
WARN_ON for I_NEW, wich we already tested a few lines above.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/inode.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/fs/inode.c b/fs/inode.c index 2cd2e48f7a20..4bedac32154f 100644 --- a/fs/inode.c +++ b/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; } |