Move rbtree to lib/
That's where it was moved in gfio, one further step towards unifying
the branches.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/Makefile b/Makefile
index a5322a9..13a6b8a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \
- rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
+ lib/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
engines/mmap.c engines/sync.c engines/null.c engines/net.c \
memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
diff --git a/fio.h b/fio.h
index 55603cb..e55413a 100644
--- a/fio.h
+++ b/fio.h
@@ -20,7 +20,6 @@
#include "thread_options.h"
#include "flist.h"
#include "fifo.h"
-#include "rbtree.h"
#include "arch/arch.h"
#include "os/os.h"
#include "mutex.h"
@@ -37,6 +36,7 @@
#include "gettime.h"
#include "lib/getopt.h"
#include "lib/rand.h"
+#include "lib/rbtree.h"
#include "server.h"
#include "stat.h"
#include "flow.h"
diff --git a/iolog.h b/iolog.h
index 6a53de2..3d140a2 100644
--- a/iolog.h
+++ b/iolog.h
@@ -1,7 +1,7 @@
#ifndef FIO_IOLOG_H
#define FIO_IOLOG_H
-#include "rbtree.h"
+#include "lib/rbtree.h"
#include "lib/ieee754.h"
/*
diff --git a/rbtree.c b/lib/rbtree.c
similarity index 100%
rename from rbtree.c
rename to lib/rbtree.c
diff --git a/rbtree.h b/lib/rbtree.h
similarity index 100%
rename from rbtree.h
rename to lib/rbtree.h