Commit b44b1126 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 5ac4d630
...@@ -478,17 +478,21 @@ xfs_ireclaim( ...@@ -478,17 +478,21 @@ xfs_ireclaim(
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct xfs_perag *pag; struct xfs_perag *pag;
xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
XFS_STATS_INC(xs_ig_reclaims); XFS_STATS_INC(xs_ig_reclaims);
/* /*
* Remove the inode from the per-AG radix tree. It doesn't matter * Remove the inode from the per-AG radix tree.
* if it was never added to it because radix_tree_delete can deal *
* with that case just fine. * Because radix_tree_delete won't complain even if the item was never
* added to the tree assert that it's been there before to catch
* problems with the inode life time early on.
*/ */
pag = xfs_get_perag(mp, ip->i_ino); pag = xfs_get_perag(mp, ip->i_ino);
write_lock(&pag->pag_ici_lock); write_lock(&pag->pag_ici_lock);
radix_tree_delete(&pag->pag_ici_root, XFS_INO_TO_AGINO(mp, ip->i_ino)); if (!radix_tree_delete(&pag->pag_ici_root, agino))
ASSERT(0);
write_unlock(&pag->pag_ici_lock); write_unlock(&pag->pag_ici_lock);
xfs_put_perag(mp, pag); xfs_put_perag(mp, pag);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment