diff options
author | Alexander Motin <mav@FreeBSD.org> | 2019-04-26 18:25:59 +0000 |
---|---|---|
committer | Alexander Motin <mav@FreeBSD.org> | 2019-04-26 18:25:59 +0000 |
commit | 32d8034f7763be11015d5f1d9260cefd75a12b1e (patch) | |
tree | 04f473267da90573e8c6356d2792379ae8e94b9c /sys/cddl/contrib/opensolaris/uts/common | |
parent | 4914ee11aea21fe3462d6c89557c5d0ee090e951 (diff) | |
download | src-32d8034f7763be11015d5f1d9260cefd75a12b1e.tar.gz src-32d8034f7763be11015d5f1d9260cefd75a12b1e.zip |
Fix minor mismerges.
No functional change.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=346760
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h index feac5ae5fbf2..961202bb6cf2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h @@ -84,7 +84,7 @@ void range_tree_init(void); void range_tree_fini(void); range_tree_t *range_tree_create_impl(range_tree_ops_t *ops, void *arg, int (*avl_compare)(const void*, const void*), uint64_t gap); - range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg); +range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg); void range_tree_destroy(range_tree_t *rt); boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size); range_seg_t *range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size); @@ -116,13 +116,6 @@ void rt_avl_remove(range_tree_t *rt, range_seg_t *rs, void *arg); void rt_avl_vacate(range_tree_t *rt, void *arg); extern struct range_tree_ops rt_avl_ops; -void rt_avl_create(range_tree_t *rt, void *arg); -void rt_avl_destroy(range_tree_t *rt, void *arg); -void rt_avl_add(range_tree_t *rt, range_seg_t *rs, void *arg); -void rt_avl_remove(range_tree_t *rt, range_seg_t *rs, void *arg); -void rt_avl_vacate(range_tree_t *rt, void *arg); -extern struct range_tree_ops rt_avl_ops; - #ifdef __cplusplus } #endif |