From f7690c4ac0c9e7609ffdf8ed6255a64e1fa44606 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@fb.com>
Date: Mon, 30 Nov 2015 19:21:08 -0700
Subject: [PATCH] Move memalign to lib/

Signed-off-by: Jens Axboe <axboe@fb.com>
---
 Makefile                     | 8 ++++----
 backend.c                    | 2 +-
 memalign.c => lib/memalign.c | 0
 memalign.h => lib/memalign.h | 0
 t/dedupe.c                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename memalign.c => lib/memalign.c (100%)
 rename memalign.h => lib/memalign.h (100%)

diff --git a/Makefile b/Makefile
index e30273ce..7686eb85 100644
--- a/Makefile
+++ b/Makefile
@@ -41,13 +41,13 @@ SOURCE :=	gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
 		lib/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
 		lib/num2str.c lib/ieee754.c lib/strntol.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 \
+		server.c client.c iolog.c backend.c libfio.c flow.c \
 		cconv.c lib/prio_tree.c lib/zipf.c lib/axmap.c lib/pattern.c \
 		lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c json.c \
 		lib/hweight.c lib/getrusage.c idletime.c td_error.c \
 		profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
 		lib/tp.c lib/bloom.c lib/gauss.c lib/mountcheck.c workqueue.c \
-		lib/output_buffer.c \
+		lib/output_buffer.c lib/memalign.c \
 		$(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c))
 
 ifdef CONFIG_LIBHDFS
@@ -222,8 +222,8 @@ endif
 
 T_DEDUPE_OBJS = t/dedupe.o
 T_DEDUPE_OBJS += lib/rbtree.o t/log.o mutex.o smalloc.o gettime.o crc/md5.o \
-		memalign.o lib/bloom.o t/debug.o crc/xxhash.o crc/murmur3.o \
-		crc/crc32c.o crc/crc32c-intel.o crc/fnv.o
+		lib/memalign.o lib/bloom.o t/debug.o crc/xxhash.o \
+		crc/murmur3.o crc/crc32c.o crc/crc32c-intel.o crc/fnv.o
 T_DEDUPE_PROGS = t/fio-dedupe
 
 T_OBJS = $(T_SMALLOC_OBJS)
diff --git a/backend.c b/backend.c
index 224736f4..9a142e82 100644
--- a/backend.c
+++ b/backend.c
@@ -49,7 +49,7 @@
 #include "cgroup.h"
 #include "profile.h"
 #include "lib/rand.h"
-#include "memalign.h"
+#include "lib/memalign.h"
 #include "server.h"
 #include "lib/getrusage.h"
 #include "idletime.h"
diff --git a/memalign.c b/lib/memalign.c
similarity index 100%
rename from memalign.c
rename to lib/memalign.c
diff --git a/memalign.h b/lib/memalign.h
similarity index 100%
rename from memalign.h
rename to lib/memalign.h
diff --git a/t/dedupe.c b/t/dedupe.c
index 5b88fcb8..e1cea50c 100644
--- a/t/dedupe.c
+++ b/t/dedupe.c
@@ -21,7 +21,7 @@
 #include "../smalloc.h"
 #include "../minmax.h"
 #include "../crc/md5.h"
-#include "../memalign.h"
+#include "../lib/memalign.h"
 #include "../os/os.h"
 #include "../gettime.h"
 #include "../fio_time.h"
-- 
2.25.1