X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=repair%2Fincore_ext.c;h=e7ef9eb234b3deabd605d0de9957adadaace8576;hb=7a326ce0f58b5effe85f29bac7d021e38f97b09d;hp=a8a4a37be847b940455082c72a0000eee05940be;hpb=30d6292288fe452eeb349d6b25f51e428a1675ec;p=thirdparty%2Fxfsprogs-dev.git diff --git a/repair/incore_ext.c b/repair/incore_ext.c index a8a4a37be..e7ef9eb23 100644 --- a/repair/incore_ext.c +++ b/repair/incore_ext.c @@ -144,7 +144,7 @@ release_extent_tree_node(extent_tree_node_t *node) * reused. the duplicate and bno/bcnt extent trees for each AG * are recycled after they're no longer needed to save memory */ -void +static void release_extent_tree(avltree_desc_t *tree) { extent_tree_node_t *ext; @@ -254,14 +254,6 @@ get_bno_extent(xfs_agnumber_t agno, extent_tree_node_t *ext) return; } -/* - * normalizing constant for bcnt size -> address conversion (see avl ops) - * used by the AVL tree code to convert sizes and must be used when - * doing an AVL search in the tree (e.g. avl_findrange(s)) - */ -#define MAXBCNT 0xFFFFFFFF -#define BCNT_ADDR(cnt) ((unsigned int) MAXBCNT - (cnt)) - /* * the next 4 routines manage the trees of free extents -- 2 trees * per AG. The first tree is sorted by block number. The second @@ -525,12 +517,12 @@ avl_ext_bcnt_end(avlnode_t *node) return((uintptr_t) ((extent_tree_node_t *)node)->ex_blockcount); } -avlops_t avl_extent_bcnt_tree_ops = { +static avlops_t avl_extent_bcnt_tree_ops = { avl_ext_bcnt_start, avl_ext_bcnt_end }; -avlops_t avl_extent_tree_ops = { +static avlops_t avl_extent_tree_ops = { avl_ext_start, avl_ext_end }; @@ -722,7 +714,7 @@ avl64_ext_end(avl64node_t *node) ((rt_extent_tree_node_t *) node)->rt_blockcount); } -avl64ops_t avl64_extent_tree_ops = { +static avl64ops_t avl64_extent_tree_ops = { avl64_rt_ext_start, avl64_ext_end }; @@ -800,7 +792,7 @@ incore_ext_teardown(xfs_mount_t *mp) extent_bno_ptrs = NULL; } -int +static int count_extents(xfs_agnumber_t agno, avltree_desc_t *tree, int whichtree) { extent_tree_node_t *node;