[PATCH] kernel: update to -rc6

[blktrace.git] / blktrace.h

diff --git a/blktrace.h b/blktrace.h
index af5ab66e11c3d5a25f3ea88c5989f2d644f8478e..604704896710d5b0ccdc67a5497cccf799ce7f9d 100644 (file)
--- a/blktrace.h
+++ b/blktrace.h
@@ -53,9 +53,10 @@ struct per_cpu_info {
 };
 
 extern FILE *ofp;
+extern int data_is_native;
 
 #define CHECK_MAGIC(t)         (((t)->magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
-#define SUPPORTED_VERSION      (0x06)
+#define SUPPORTED_VERSION      (0x07)
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define be16_to_cpu(x)         __bswap_16(x)
@@ -90,24 +91,11 @@ static inline int verify_trace(struct blk_io_trace *t)
        return 0;
 }
 
-static inline void trace_to_be(struct blk_io_trace *t)
-{
-       t->magic        = cpu_to_be32(t->magic);
-       t->sequence     = cpu_to_be32(t->sequence);
-       t->time         = cpu_to_be64(t->time);
-       t->sector       = cpu_to_be64(t->sector);
-       t->bytes        = cpu_to_be32(t->bytes);
-       t->action       = cpu_to_be32(t->action);
-       t->pid          = cpu_to_be32(t->pid);
-       t->cpu          = cpu_to_be32(t->cpu);
-       t->error        = cpu_to_be16(t->error);
-       t->pdu_len      = cpu_to_be16(t->pdu_len);
-       t->device       = cpu_to_be32(t->device);
-       /* t->comm is a string (endian neutral) */
-}
-
 static inline void trace_to_cpu(struct blk_io_trace *t)
 {
+       if (data_is_native)
+               return;
+
        t->magic        = be32_to_cpu(t->magic);
        t->sequence     = be32_to_cpu(t->sequence);
        t->time         = be64_to_cpu(t->time);
@@ -115,11 +103,29 @@ static inline void trace_to_cpu(struct blk_io_trace *t)
        t->bytes        = be32_to_cpu(t->bytes);
        t->action       = be32_to_cpu(t->action);
        t->pid          = be32_to_cpu(t->pid);
-       t->cpu          = be32_to_cpu(t->cpu);
+       t->device       = be32_to_cpu(t->device);
+       t->cpu          = be16_to_cpu(t->cpu);
        t->error        = be16_to_cpu(t->error);
        t->pdu_len      = be16_to_cpu(t->pdu_len);
-       t->device       = be32_to_cpu(t->device);
-       /* t->comm is a string (endian neutral) */
+}
+
+/*
+ * check whether data is native or not
+ */
+static inline int check_data_endianness(u32 magic)
+{
+       if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+               data_is_native = 1;
+               return 0;
+       }
+
+       magic = __bswap_32(magic);
+       if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+               data_is_native = 0;
+               return 0;
+       }
+
+       return 1;
 }
 
 extern void set_all_format_specs(char *);
@@ -128,5 +134,6 @@ extern void process_fmt(char *, struct per_cpu_info *, struct blk_io_trace *,
                        unsigned long long, int, unsigned char *);
 extern int valid_act_opt(int);
 extern int find_mask_map(char *);
+extern char *find_process_name(pid_t);
 
 #endif