Move thread options into a seperate structure

[fio.git] / os-linux.h

diff --git a/os-linux.h b/os-linux.h
index 84919539e7a711e6c7d724705314a2c6e03d707b..1ed3d3b650b206921c0c22a5b1e3c656820d228e 100644 (file)
--- a/os-linux.h
+++ b/os-linux.h
@@ -32,7 +32,7 @@ typedef struct drand48_data os_random_state_t;
        posix_fadvise((fd), (off_t)(off), (len), (advice))
 
 #define fio_setaffinity(td)            \
-       sched_setaffinity((td)->pid, sizeof((td)->cpumask), &(td)->cpumask)
+       sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
 #define fio_getaffinity(pid, ptr)      \
        sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
 
@@ -124,10 +124,7 @@ enum {
 
 static inline int blockdev_invalidate_cache(int fd)
 {
-       if (!ioctl(fd, BLKFLSBUF))
-               return 0;
-
-       return errno;
+       return ioctl(fd, BLKFLSBUF);
 }
 
 static inline int blockdev_size(int fd, unsigned long long *bytes)