aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2019-09-09 15:37:06 -0400
committerEric Sandeen <sandeen@redhat.com>2019-09-09 15:37:06 -0400
commit8bf7924ed2ca7726d6b7371c81d3da80a6b4e8f6 (patch)
tree4d3b103cec26e8585420c3debc475a7ab78fe9ad
parent140519095b6893351a35ce5e311455026e8315ba (diff)
downloadxfsprogs-dev-8bf7924ed2ca7726d6b7371c81d3da80a6b4e8f6.tar.gz
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>
-rw-r--r--include/Makefile1
-rw-r--r--include/libxfs.h2
-rw-r--r--libfrog/Makefile1
-rw-r--r--libfrog/radix-tree.h (renamed from include/radix-tree.h)6
-rw-r--r--libxfs/libxfs_priv.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/include/Makefile b/include/Makefile
index 7b922420f4..2a00dea928 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 dd5fe5427c..663063bcf7 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 25ea248ecd..482893efcd 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
index 81ee010c8c..f08156b9d0 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 8b3de1703b..ec4d7d3b3d 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"