projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glusterfs: update for new API
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 36b6bb2ed5662671d3116cee533ef81e9240688b..e47296801345d312249a277445e32bb42a6477a1 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-323,7
+323,7
@@
static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
#endif
#ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE
#endif
#ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE
-static inline int init_random_seeds(u
nsigned long
*rand_seeds, int size)
+static inline int init_random_seeds(u
int64_t
*rand_seeds, int size)
{
int fd;
{
int fd;
@@
-373,11
+373,13
@@
static inline int CPU_COUNT(os_cpu_mask_t *mask)
#endif
#ifndef FIO_HAVE_GETTID
#endif
#ifndef FIO_HAVE_GETTID
+#ifndef CONFIG_HAVE_GETTID
static inline int gettid(void)
{
return getpid();
}
#endif
static inline int gettid(void)
{
return getpid();
}
#endif
+#endif
#ifndef FIO_HAVE_SHM_ATTACH_REMOVED
static inline int shm_attach_to_open_removed(void)
#ifndef FIO_HAVE_SHM_ATTACH_REMOVED
static inline int shm_attach_to_open_removed(void)