splice: update to new vmsplice-to-user interface

[fio.git] / blktrace.c

diff --git a/blktrace.c b/blktrace.c
index 629aebed84d7b40ebcb58942f1383a6a8b0bdfae..58f28ceb664db93a4ca0e97f0405a066929d3b38 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -75,10 +75,8 @@ int is_blktrace(const char *filename)
        int fd, ret;
 
        fd = open(filename, O_RDONLY);
-       if (fd < 0) {
-               perror("open blktrace");
+       if (fd < 0)
                return 0;
-       }
 
        ret = read(fd, &t, sizeof(t));
        close(fd);
@@ -142,16 +140,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
        return found;
 }
 
-#define MINORBITS      20
-#define MINORMASK      ((1U << MINORBITS) - 1)
-#define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
-#define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
+#define FMINORBITS     20
+#define FMINORMASK     ((1U << FMINORBITS) - 1)
+#define FMAJOR(dev)    ((unsigned int) ((dev) >> FMINORBITS))
+#define FMINOR(dev)    ((unsigned int) ((dev) & FMINORMASK))
 
 static void trace_add_file(struct thread_data *td, __u32 device)
 {
        static unsigned int last_maj, last_min;
-       unsigned int maj = MAJOR(device);
-       unsigned int min = MINOR(device);
+       unsigned int maj = FMAJOR(device);
+       unsigned int min = FMINOR(device);
        struct fio_file *f;
        char dev[256];
        unsigned int i;
@@ -283,6 +281,8 @@ int load_blktrace(struct thread_data *td, const char *filename)
                        log_err("fio: discarded %d of %d\n", ret, t.pdu_len);
                        goto err;
                }
+               if (t.action & BLK_TC_ACT(BLK_TC_NOTIFY))
+                       continue;
                if (!ttime) {
                        ttime = t.time;
                        cpu = t.cpu;