From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 9 Sep 2019 19:37:06 +0000 (-0400)
Subject: libfrog: move radix-tree.h to libfrog/
X-Git-Tag: v5.3.0-rc2~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bf7924ed2ca7726d6b7371c81d3da80a6b4e8f6;p=thirdparty%2Fxfsprogs-dev.git

libfrog: move radix-tree.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/include/Makefile b/include/Makefile
index 7b922420f..2a00dea92 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -16,7 +16,6 @@ LIBHFILES = libxfs.h \
 	kmem.h \
 	list.h \
 	parent.h \
-	radix-tree.h \
 	xfs_btree_trace.h \
 	xfs_inode.h \
 	xfs_log_recover.h \
diff --git a/include/libxfs.h b/include/libxfs.h
index dd5fe5427..663063bcf 100644
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -16,7 +16,7 @@
 #include "cache.h"
 #include "bitops.h"
 #include "kmem.h"
-#include "radix-tree.h"
+#include "libfrog/radix-tree.h"
 #include "atomic.h"
 
 #include "xfs_types.h"
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 25ea248ec..482893efc 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -36,6 +36,7 @@ crc32defs.h \
 crc32table.h \
 fsgeom.h \
 ptvar.h \
+radix-tree.h \
 topology.h
 
 LSRCFILES += gen_crc32table.c
diff --git a/include/radix-tree.h b/libfrog/radix-tree.h
similarity index 94%
rename from include/radix-tree.h
rename to libfrog/radix-tree.h
index 81ee010c8..f08156b9d 100644
--- a/include/radix-tree.h
+++ b/libfrog/radix-tree.h
@@ -3,8 +3,8 @@
  * Copyright (C) 2001 Momchil Velikov
  * Portions Copyright (C) 2001 Christoph Hellwig
  */
-#ifndef __XFS_SUPPORT_RADIX_TREE_H__
-#define __XFS_SUPPORT_RADIX_TREE_H__
+#ifndef __LIBFROG_RADIX_TREE_H__
+#define __LIBFROG_RADIX_TREE_H__
 
 #define RADIX_TREE_TAGS
 
@@ -60,4 +60,4 @@ radix_tree_gang_lookup_tag(struct radix_tree_root *root, void **results,
 int radix_tree_tagged(struct radix_tree_root *root, unsigned int tag);
 #endif
 
-#endif /* __XFS_SUPPORT_RADIX_TREE_H__ */
+#endif /* __LIBFROG_RADIX_TREE_H__ */
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 8b3de1703..ec4d7d3b3 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -46,7 +46,7 @@
 #include "cache.h"
 #include "bitops.h"
 #include "kmem.h"
-#include "radix-tree.h"
+#include "libfrog/radix-tree.h"
 #include "atomic.h"
 
 #include "xfs_types.h"