Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: properly account for reclaimed inodes
+14
-5
fs/xfs/linux-2.6/xfs_sync.c
+14
-5
fs/xfs/linux-2.6/xfs_sync.c
···
668
668
xfs_perag_put(pag);
669
669
}
670
670
671
-
void
672
-
__xfs_inode_clear_reclaim_tag(
673
-
xfs_mount_t *mp,
671
+
STATIC void
672
+
__xfs_inode_clear_reclaim(
674
673
xfs_perag_t *pag,
675
674
xfs_inode_t *ip)
676
675
{
677
-
radix_tree_tag_clear(&pag->pag_ici_root,
678
-
XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
679
676
pag->pag_ici_reclaimable--;
680
677
if (!pag->pag_ici_reclaimable) {
681
678
/* clear the reclaim tag from the perag radix tree */
···
684
687
trace_xfs_perag_clear_reclaim(ip->i_mount, pag->pag_agno,
685
688
-1, _RET_IP_);
686
689
}
690
+
}
691
+
692
+
void
693
+
__xfs_inode_clear_reclaim_tag(
694
+
xfs_mount_t *mp,
695
+
xfs_perag_t *pag,
696
+
xfs_inode_t *ip)
697
+
{
698
+
radix_tree_tag_clear(&pag->pag_ici_root,
699
+
XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
700
+
__xfs_inode_clear_reclaim(pag, ip);
687
701
}
688
702
689
703
/*
···
846
838
if (!radix_tree_delete(&pag->pag_ici_root,
847
839
XFS_INO_TO_AGINO(ip->i_mount, ip->i_ino)))
848
840
ASSERT(0);
841
+
__xfs_inode_clear_reclaim(pag, ip);
849
842
write_unlock(&pag->pag_ici_lock);
850
843
851
844
/*