aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2009-12-01 13:12:29 -0500
committerAlex Elder <aelder@sgi.com>2009-12-16 14:20:15 -0500
commitb44b1126279b60597f96bbe77507b1650f88a969 (patch)
tree220cb8d4903532c2551ee2bdffa03885cdc642ba /fs
parent5ac4d630eb87656bd4dc313b910776d54d88ea28 (diff)
xfs: check for not fully initialized inodes in xfs_ireclaim
Add an assert for inodes not added to the inode cache in xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Alex Elder <aelder@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_iget.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/xfs/xfs_iget.c b/fs/xfs/xfs_iget.c
index f5c904a10c11..0de36c2a46f1 100644
--- a/fs/xfs/xfs_iget.c
+++ b/fs/xfs/xfs_iget.c
@@ -478,17 +478,21 @@ xfs_ireclaim(
478{ 478{
479 struct xfs_mount *mp = ip->i_mount; 479 struct xfs_mount *mp = ip->i_mount;
480 struct xfs_perag *pag; 480 struct xfs_perag *pag;
481 xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
481 482
482 XFS_STATS_INC(xs_ig_reclaims); 483 XFS_STATS_INC(xs_ig_reclaims);
483 484
484 /* 485 /*
485 * Remove the inode from the per-AG radix tree. It doesn't matter 486 * Remove the inode from the per-AG radix tree.
486 * if it was never added to it because radix_tree_delete can deal 487 *
487 * with that case just fine. 488 * Because radix_tree_delete won't complain even if the item was never
489 * added to the tree assert that it's been there before to catch
490 * problems with the inode life time early on.
488 */ 491 */
489 pag = xfs_get_perag(mp, ip->i_ino); 492 pag = xfs_get_perag(mp, ip->i_ino);
490 write_lock(&pag->pag_ici_lock); 493 write_lock(&pag->pag_ici_lock);
491 radix_tree_delete(&pag->pag_ici_root, XFS_INO_TO_AGINO(mp, ip->i_ino)); 494 if (!radix_tree_delete(&pag->pag_ici_root, agino))
495 ASSERT(0);
492 write_unlock(&pag->pag_ici_lock); 496 write_unlock(&pag->pag_ici_lock);
493 xfs_put_perag(mp, pag); 497 xfs_put_perag(mp, pag);
494 498