projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile: tiny fix of libhdfs
[fio.git]
/
smalloc.c
diff --git
a/smalloc.c
b/smalloc.c
index d038ac64ccfb8dedbe2801ed3630dafbb121b97c..cab7132511b1729b152278f119d300c83f54b5d2 100644
(file)
--- a/
smalloc.c
+++ b/
smalloc.c
@@
-13,6
+13,7
@@
#include <limits.h>
#include <fcntl.h>
#include <limits.h>
#include <fcntl.h>
+#include "fio.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
#include "mutex.h"
#include "arch/arch.h"
#include "os/os.h"
@@
-188,7
+189,7
@@
static bool add_pool(struct pool *pool, unsigned int alloc_size)
goto out_fail;
pool->map = ptr;
goto out_fail;
pool->map = ptr;
- pool->bitmap = (
void *) ptr + (pool->nr_blocks * SMALLOC_BPL
);
+ pool->bitmap = (
unsigned int *)((char *) ptr + (pool->nr_blocks * SMALLOC_BPL)
);
memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
memset(pool->bitmap, 0, bitmap_blocks * sizeof(unsigned int));
pool->lock = fio_mutex_init(FIO_MUTEX_UNLOCKED);
@@
-248,7
+249,7
@@
static void *postred_ptr(struct block_hdr *hdr)
uintptr_t ptr;
ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
uintptr_t ptr;
ptr = (uintptr_t) hdr + hdr->size - sizeof(unsigned int);
- ptr = (
ptr + int_mask) & ~int_mask
;
+ ptr = (
uintptr_t) PTR_ALIGN(ptr, int_mask)
;
return (void *) ptr;
}
return (void *) ptr;
}