[PATCH] Fix per_cpu_info->cpu setting

Not all traces are from CPU 0! Noticed by Nathan.

diff --git a/blkparse.c b/blkparse.c
index c4c05a50ff0062eacf9fde783d833e2a27355044..26dfdb1d52122b063f211da2ac0e85cc0bd5a9c4 100644 (file)
--- a/blkparse.c
+++ b/blkparse.c
@@ -113,10 +113,18 @@ static void resize_cpu_info(int cpuid)
 
 static struct per_cpu_info *get_cpu_info(int cpu)
 {
+       struct per_cpu_info *pci;
+
        if (cpu >= max_cpus)
                resize_cpu_info(cpu);
 
-       return &per_cpu_info[cpu];
+       /*
+        * ->cpu might already be set, but just set it unconditionally
+        */
+       pci = &per_cpu_info[cpu];
+       pci->cpu = cpu;
+
+       return pci;
 }
 
 static inline void check_time(struct blk_io_trace *bit)
@@ -576,7 +584,6 @@ static int do_file(void)
                void *tb;
 
                pci = get_cpu_info(i);
-               pci->cpu = i;
                pci->ofp = NULL;
 
                snprintf(pci->fname, sizeof(pci->fname)-1,"%s_out.%d", dev, i);