aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Peschke <mpeschke@linux.vnet.ibm.com>2009-05-11 08:41:33 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-05-11 08:41:33 +0200
commitaf90543f47f93782df94a3a56d4f607f4dd6ad4c (patch)
tree284fab2615e9becef2940d5169163d32a78159ae
parentb5f8804a588fffdea10a0cd46a36fc196acea9f2 (diff)
downloadblktrace-af90543f47f93782df94a3a56d4f607f4dd6ad4c.tar.gz
blkiomon: fix unaligned accesses on ia64
commit 7aa3ebcec011bfe9cc60d6476252c03376a37551 packed the blkiomon_stat structure so that traces from one arch could be analyzed on another (in truth only x86 is different, at least from x86_64/ia64/ppc/ppc64/s390/s390x) Moving the __u32 device member instead of a new padding field should be fine. Signed-off-by: Martin Peschke <mpeschke@linux.vnet.ibm.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--blkiomon.c2
-rw-r--r--blkiomon.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/blkiomon.c b/blkiomon.c
index c3c1b11..54c8fa7 100644
--- a/blkiomon.c
+++ b/blkiomon.c
@@ -71,7 +71,7 @@ struct output {
int pipe;
};
-static char blkiomon_version[] = "0.2";
+static char blkiomon_version[] = "0.3";
static FILE *ifp;
static int interval = -1;
diff --git a/blkiomon.h b/blkiomon.h
index 2e430a6..2ea1716 100644
--- a/blkiomon.h
+++ b/blkiomon.h
@@ -34,6 +34,7 @@ struct blkiomon_stat {
__u64 time;
__u32 size_hist[BLKIOMON_SIZE_BUCKETS];
__u32 d2c_hist[BLKIOMON_D2C_BUCKETS];
+ __u32 device;
struct minmax size_r;
struct minmax size_w;
struct minmax d2c_r;
@@ -41,8 +42,7 @@ struct blkiomon_stat {
struct minmax thrput_r;
struct minmax thrput_w;
__u64 bidir;
- __u32 device;
-} __attribute__ ((packed));
+};
static struct histlog2 size_hist = {
.first = 0,