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>

diff --git a/blkiomon.c b/blkiomon.c
index c3c1b114908133287055d63cc28ee57725e7617c..54c8fa7d370f95500eb3ce38a65cd32061a763d5 100644 (file)
--- 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 2e430a61533654ca26afc4312c510c1e9c9477ee..2ea17161c1ab3aab0236fbefba2b1e7be3512eb0 100644 (file)
--- 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,