Fix build/compile for non-blktrace platforms

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

diff --git a/os/os-linux.h b/os/os-linux.h
index 561b273db94e3dcd590e7e6dbfa24e39c497ba00..7fa0c9566a6d4e24405b93563f3958b87dd639bb 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -22,6 +22,7 @@
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_HUGETLB
 #define FIO_HAVE_RAWBIND
+#define FIO_HAVE_BLKTRACE
 
 #define OS_MAP_ANON            (MAP_ANONYMOUS)
 
@@ -109,12 +110,20 @@ static inline long umem_add(unsigned long *uptr, unsigned long inc)
 }
 #endif /* FIO_HAVE_SYSLET */
 
+enum {
+       IOPRIO_CLASS_NONE,
+       IOPRIO_CLASS_RT,
+       IOPRIO_CLASS_BE,
+       IOPRIO_CLASS_IDLE,
+};
+
 enum {
        IOPRIO_WHO_PROCESS = 1,
        IOPRIO_WHO_PGRP,
        IOPRIO_WHO_USER,
 };
 
+#define IOPRIO_BITS            16
 #define IOPRIO_CLASS_SHIFT     13
 
 #ifndef BLKGETSIZE64
@@ -171,13 +180,13 @@ static inline double os_random_double(os_random_state_t *rs)
        return val;
 }
 
-static inline void fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
+static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
        struct raw_config_request rq;
        int fd;
 
        if (major(dev) != RAW_MAJOR)
-               return;
+               return 1;
 
        /*
         * we should be able to find /dev/rawctl or /dev/raw/rawctl
@@ -186,18 +195,19 @@ static inline void fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
        if (fd < 0) {
                fd = open("/dev/raw/rawctl", O_RDONLY);
                if (fd < 0)
-                       return;
+                       return 1;
        }
 
        rq.raw_minor = minor(dev);
        if (ioctl(fd, RAW_GETBIND, &rq) < 0) {
                close(fd);
-               return;
+               return 1;
        }
 
        close(fd);
        *majdev = rq.block_major;
        *mindev = rq.block_minor;
+       return 0;
 }
 
 #endif