From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Move this header to libfrog since the code is there already.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
include/avl64.h | 127 ---------------------------------------------------
libfrog/Makefile | 1
libfrog/avl64.h | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++
repair/incore_ext.c | 2 -
repair/xfs_repair.c | 2 -
scrub/phase1.c | 2 -
6 files changed, 131 insertions(+), 130 deletions(-)
delete mode 100644 include/avl64.h
create mode 100644 libfrog/avl64.h
diff --git a/include/avl64.h b/include/avl64.h
deleted file mode 100644
index 4042f6c3..00000000
--- a/include/avl64.h
+++ /dev/null
@@ -1,127 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
- * All Rights Reserved.
- */
-#ifndef __XR_AVL64_H__
-#define __XR_AVL64_H__
-
-#include <sys/types.h>
-
-typedef struct avl64node {
- struct avl64node *avl_forw; /* pointer to right child (> parent) */
- struct avl64node *avl_back; /* pointer to left child (< parent) */
- struct avl64node *avl_parent; /* parent pointer */
- struct avl64node *avl_nextino; /* next in-order; NULL terminated list*/
- char avl_balance; /* tree balance */
-} avl64node_t;
-
-/*
- * avl-tree operations
- */
-typedef struct avl64ops {
- uint64_t (*avl_start)(avl64node_t *);
- uint64_t (*avl_end)(avl64node_t *);
-} avl64ops_t;
-
-/*
- * avoid complaints about multiple def's since these are only used by
- * the avl code internally
- */
-#ifndef AVL_START
-#define AVL_START(tree, n) (*(tree)->avl_ops->avl_start)(n)
-#define AVL_END(tree, n) (*(tree)->avl_ops->avl_end)(n)
-#endif
-
-/*
- * tree descriptor:
- * root points to the root of the tree.
- * firstino points to the first in the ordered list.
- */
-typedef struct avl64tree_desc {
- avl64node_t *avl_root;
- avl64node_t *avl_firstino;
- avl64ops_t *avl_ops;
-} avl64tree_desc_t;
-
-/* possible values for avl_balance */
-
-#define AVL_BACK 1
-#define AVL_BALANCE 0
-#define AVL_FORW 2
-
-/*
- * 'Exported' avl tree routines
- */
-avl64node_t
-*avl64_insert(
- avl64tree_desc_t *tree,
- avl64node_t *newnode);
-
-void
-avl64_delete(
- avl64tree_desc_t *tree,
- avl64node_t *np);
-
-void
-avl64_insert_immediate(
- avl64tree_desc_t *tree,
- avl64node_t *afterp,
- avl64node_t *newnode);
-
-avl64node_t *
-avl64_firstino(avl64node_t *root);
-
-avl64node_t *
-avl64_lastino(avl64node_t *root);
-
-void
-avl64_init_tree(
- avl64tree_desc_t *tree,
- avl64ops_t *ops);
-
-avl64node_t *
-avl64_findrange(
- avl64tree_desc_t *tree,
- uint64_t value);
-
-avl64node_t *
-avl64_find(
- avl64tree_desc_t *tree,
- uint64_t value);
-
-avl64node_t *
-avl64_findanyrange(
- avl64tree_desc_t *tree,
- uint64_t start,
- uint64_t end,
- int checklen);
-
-
-avl64node_t *
-avl64_findadjacent(
- avl64tree_desc_t *tree,
- uint64_t value,
- int dir);
-
-void
-avl64_findranges(
- avl64tree_desc_t *tree,
- uint64_t start,
- uint64_t end,
- avl64node_t **startp,
- avl64node_t **endp);
-
-/*
- * avoid complaints about multiple def's since these are only used by
- * the avl code internally
- */
-#ifndef AVL_PRECEED
-#define AVL_PRECEED 0x1
-#define AVL_SUCCEED 0x2
-
-#define AVL_INCLUDE_ZEROLEN 0x0000
-#define AVL_EXCLUDE_ZEROLEN 0x0001
-#endif
-
-#endif /* __XR_AVL64_H__ */
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 37976029..e766adba 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -28,6 +28,7 @@ util.c \
workqueue.c
HFILES = \
+avl64.h \
bulkstat.h \
crc32defs.h \
crc32table.h \
diff --git a/libfrog/avl64.h b/libfrog/avl64.h
new file mode 100644
index 00000000..283fc91c
--- /dev/null
+++ b/libfrog/avl64.h
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ */
+#ifndef __LIBFROG_AVL64_H__
+#define __LIBFROG_AVL64_H__
+
+#include <sys/types.h>
+
+typedef struct avl64node {
+ struct avl64node *avl_forw; /* pointer to right child (> parent) */
+ struct avl64node *avl_back; /* pointer to left child (< parent) */
+ struct avl64node *avl_parent; /* parent pointer */
+ struct avl64node *avl_nextino; /* next in-order; NULL terminated list*/
+ char avl_balance; /* tree balance */
+} avl64node_t;
+
+/*
+ * avl-tree operations
+ */
+typedef struct avl64ops {
+ uint64_t (*avl_start)(avl64node_t *);
+ uint64_t (*avl_end)(avl64node_t *);
+} avl64ops_t;
+
+/*
+ * avoid complaints about multiple def's since these are only used by
+ * the avl code internally
+ */
+#ifndef AVL_START
+#define AVL_START(tree, n) (*(tree)->avl_ops->avl_start)(n)
+#define AVL_END(tree, n) (*(tree)->avl_ops->avl_end)(n)
+#endif
+
+/*
+ * tree descriptor:
+ * root points to the root of the tree.
+ * firstino points to the first in the ordered list.
+ */
+typedef struct avl64tree_desc {
+ avl64node_t *avl_root;
+ avl64node_t *avl_firstino;
+ avl64ops_t *avl_ops;
+} avl64tree_desc_t;
+
+/* possible values for avl_balance */
+
+#define AVL_BACK 1
+#define AVL_BALANCE 0
+#define AVL_FORW 2
+
+/*
+ * 'Exported' avl tree routines
+ */
+avl64node_t
+*avl64_insert(
+ avl64tree_desc_t *tree,
+ avl64node_t *newnode);
+
+void
+avl64_delete(
+ avl64tree_desc_t *tree,
+ avl64node_t *np);
+
+void
+avl64_insert_immediate(
+ avl64tree_desc_t *tree,
+ avl64node_t *afterp,
+ avl64node_t *newnode);
+
+avl64node_t *
+avl64_firstino(avl64node_t *root);
+
+avl64node_t *
+avl64_lastino(avl64node_t *root);
+
+void
+avl64_init_tree(
+ avl64tree_desc_t *tree,
+ avl64ops_t *ops);
+
+avl64node_t *
+avl64_findrange(
+ avl64tree_desc_t *tree,
+ uint64_t value);
+
+avl64node_t *
+avl64_find(
+ avl64tree_desc_t *tree,
+ uint64_t value);
+
+avl64node_t *
+avl64_findanyrange(
+ avl64tree_desc_t *tree,
+ uint64_t start,
+ uint64_t end,
+ int checklen);
+
+
+avl64node_t *
+avl64_findadjacent(
+ avl64tree_desc_t *tree,
+ uint64_t value,
+ int dir);
+
+void
+avl64_findranges(
+ avl64tree_desc_t *tree,
+ uint64_t start,
+ uint64_t end,
+ avl64node_t **startp,
+ avl64node_t **endp);
+
+/*
+ * avoid complaints about multiple def's since these are only used by
+ * the avl code internally
+ */
+#ifndef AVL_PRECEED
+#define AVL_PRECEED 0x1
+#define AVL_SUCCEED 0x2
+
+#define AVL_INCLUDE_ZEROLEN 0x0000
+#define AVL_EXCLUDE_ZEROLEN 0x0001
+#endif
+
+#endif /* __LIBFROG_AVL64_H__ */
diff --git a/repair/incore_ext.c b/repair/incore_ext.c
index e7ef9eb2..7292f5dc 100644
--- a/repair/incore_ext.c
+++ b/repair/incore_ext.c
@@ -12,7 +12,7 @@
#include "agheader.h"
#include "protos.h"
#include "err_protos.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
#include "threads.h"
/*
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index e414c4fb..d7e70dd0 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "xfs_multidisk.h"
#include "avl.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
#include "globals.h"
#include "versions.h"
#include "agheader.h"
diff --git a/scrub/phase1.c b/scrub/phase1.c
index 81b0990d..6d1cbe25 100644
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -19,7 +19,7 @@
#include "path.h"
#include "handle.h"
#include "bitops.h"
-#include "avl64.h"
+#include "libfrog/avl64.h"
#include "list.h"
#include "xfs_scrub.h"
#include "common.h"
