--- fs/xfs/xfs_iget.c

+++ fs/xfs/xfs_iget.c

@@ -228,13 +228,12 @@ xfs_iget_cache_hit(

xfs_itrace_exit_tag(ip, "xfs_iget.alloc");

/*

- * We need to set XFS_INEW atomically with clearing the

- * reclaimable tag so that we do have an indicator of the

- * inode still being initialized.

+ * We need to set XFS_IRECLAIM to prevent xfs_reclaim_inode

+ * from stomping over us while we recycle the inode. We can't

+ * clear the radix tree reclaimable tag yet as it requires

+ * pag_ici_lock to be held exclusive.

*/

- ip->i_flags |= XFS_INEW;

- ip->i_flags &= ~XFS_IRECLAIMABLE;

- __xfs_inode_clear_reclaim_tag(mp, pag, ip);

+ ip->i_flags |= XFS_IRECLAIM;

spin_unlock(&ip->i_flags_lock);

read_unlock(&pag->pag_ici_lock);

@@ -253,7 +252,15 @@ xfs_iget_cache_hit(

__xfs_inode_set_reclaim_tag(pag, ip);

goto out_error;

}

+

+ write_lock(&pag->pag_ici_lock);

+ spin_lock(&ip->i_flags_lock);

+ ip->i_flags &= ~(XFS_IRECLAIMABLE | XFS_IRECLAIM);

+ ip->i_flags |= XFS_INEW;

+ __xfs_inode_clear_reclaim_tag(mp, pag, ip);

inode->i_state = I_LOCK|I_NEW;

+ spin_unlock(&ip->i_flags_lock);

+ write_unlock(&pag->pag_ici_lock);

} else {

/* If the VFS inode is being torn down, pause and try again. */

if (!igrab(inode)) {

@@ -511,17 +518,21 @@ xfs_ireclaim(

{

struct xfs_mount *mp = ip->i_mount;

struct xfs_perag *pag;

+ xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);

XFS_STATS_INC(xs_ig_reclaims);

/*

- * Remove the inode from the per-AG radix tree. It doesn't matter

- * if it was never added to it because radix_tree_delete can deal

- * with that case just fine.

+ * Remove the inode from the per-AG radix tree.

+ *

+ * 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);

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);

xfs_put_perag(mp, pag);