From: Tomohiro Kusumi <tkusumi@tuxera.com>
Date: Tue, 4 Apr 2017 20:22:15 +0000 (+0300)
Subject: Make lib/memalign.c a stand-alone library
X-Git-Tag: fio-2.20~50
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=087c0cba36b6d2bf9c5f9b9ce96f308e0be1bd9e

Make lib/memalign.c a stand-alone library

lib/memalign.c not having dependency on fio.h enables it to be
a stand-alone library, which is useful for debugging purpose.
In fact, most of the files under lib/ directory do things this way.

(For lib/memalign.c, it was actually myself who introduced this
dependency as a part of changes made by 248c9436, so this commit
is partially reverting that)

--
 # cat ./test3.c
 #include <stdio.h>
 #include "lib/memalign.h"
 int main(void) {
         char *p = fio_memalign(4096, 1000000);
         printf("%p\n", p);
         fio_memfree(p, 1000000);
         return 0;
 }
 # gcc -Wall -g ./test3.c ./lib/memalign.c
 # ./a.out
 0x7fbb7bbbc000

Signed-off-by: Tomohiro Kusumi <tkusumi@tuxera.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/lib/memalign.c b/lib/memalign.c
index 1d1ba9ba..137cc8ec 100644
--- a/lib/memalign.c
+++ b/lib/memalign.c
@@ -3,7 +3,9 @@
 #include <inttypes.h>
 
 #include "memalign.h"
-#include "../fio.h"
+
+#define PTR_ALIGN(ptr, mask)   \
+	(char *)((uintptr_t)((ptr) + (mask)) & ~(mask))
 
 struct align_footer {
 	unsigned int offset;