Missing carriage return in latency print

[fio.git] / blktrace.c

diff --git a/blktrace.c b/blktrace.c
index 5ed2619d2cf845a33fa9fa2f349b3f0485f254de..b4d05c739cdc6843dedda732908dbd67fdfb21de 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,11 +140,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
        return found;
 }
 
+#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;