glusterfs: update for new API

[fio.git] / os / os-linux.h

diff --git a/os/os-linux.h b/os/os-linux.h
index a550bba6e1b3d785d554564258840874c93e8104..36339ef3e94250200c909e4fbad2fcf8dffcd7f4 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -60,8 +60,6 @@
 
 typedef cpu_set_t os_cpu_mask_t;
 
-typedef struct drand48_data os_random_state_t;
-
 #ifdef CONFIG_3ARG_AFFINITY
 #define fio_setaffinity(pid, cpumask)          \
        sched_setaffinity((pid), sizeof(cpumask), &(cpumask))
@@ -126,10 +124,12 @@ static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
        return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
+#ifndef CONFIG_HAVE_GETTID
 static inline int gettid(void)
 {
        return syscall(__NR_gettid);
 }
+#endif
 
 #define SPLICE_DEF_SIZE        (64*1024)
 
@@ -170,19 +170,6 @@ static inline unsigned long long os_phys_mem(void)
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       srand48_r(seed, rs);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       long val;
-
-       lrand48_r(rs, &val);
-       return val;
-}
-
 static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
        struct raw_config_request rq;
@@ -403,7 +390,7 @@ static inline bool fio_fallocate(struct fio_file *f, uint64_t offset,
                                 uint64_t len)
 {
        int ret;
-       ret = fallocate(f->fd, 0, 0, len);
+       ret = fallocate(f->fd, 0, offset, len);
        if (ret == 0)
                return true;