linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / block / aoe / aoecmd.c

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index b5be4b7..326ca38 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -8,6 +8,7 @@
 #include <linux/blkdev.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <asm/unaligned.h>
 #include "aoe.h"
 
 #define TIMERTICK (HZ / 10)
@@ -311,16 +312,16 @@ ataid_complete(struct aoedev *d, unsigned char *id)
        u16 n;
 
        /* word 83: command set supported */
-       n = le16_to_cpup((__le16 *) &id[83<<1]);
+       n = le16_to_cpu(get_unaligned((__le16 *) &id[83<<1]));
 
        /* word 86: command set/feature enabled */
-       n |= le16_to_cpup((__le16 *) &id[86<<1]);
+       n |= le16_to_cpu(get_unaligned((__le16 *) &id[86<<1]));
 
        if (n & (1<<10)) {      /* bit 10: LBA 48 */
                d->flags |= DEVFL_EXT;
 
                /* word 100: number lba48 sectors */
-               ssize = le64_to_cpup((__le64 *) &id[100<<1]);
+               ssize = le64_to_cpu(get_unaligned((__le64 *) &id[100<<1]));
 
                /* set as in ide-disk.c:init_idedisk_capacity */
                d->geo.cylinders = ssize;
@@ -331,12 +332,12 @@ ataid_complete(struct aoedev *d, unsigned char *id)
                d->flags &= ~DEVFL_EXT;
 
                /* number lba28 sectors */
-               ssize = le32_to_cpup((__le32 *) &id[60<<1]);
+               ssize = le32_to_cpu(get_unaligned((__le32 *) &id[60<<1]));
 
                /* NOTE: obsolete in ATA 6 */
-               d->geo.cylinders = le16_to_cpup((__le16 *) &id[54<<1]);
-               d->geo.heads = le16_to_cpup((__le16 *) &id[55<<1]);
-               d->geo.sectors = le16_to_cpup((__le16 *) &id[56<<1]);
+               d->geo.cylinders = le16_to_cpu(get_unaligned((__le16 *) &id[54<<1]));
+               d->geo.heads = le16_to_cpu(get_unaligned((__le16 *) &id[55<<1]));
+               d->geo.sectors = le16_to_cpu(get_unaligned((__le16 *) &id[56<<1]));
        }
        d->ssize = ssize;
        d->geo.start = 0;
@@ -467,16 +468,11 @@ aoecmd_ata_rsp(struct sk_buff *skb)
                        unsigned long duration = jiffies - buf->start_time;
                        unsigned long n_sect = buf->bio->bi_size >> 9;
                        struct gendisk *disk = d->gd;
+                       const int rw = bio_data_dir(buf->bio);
 
-                       if (bio_data_dir(buf->bio) == WRITE) {
-                               disk_stat_inc(disk, writes);
-                               disk_stat_add(disk, write_ticks, duration);
-                               disk_stat_add(disk, write_sectors, n_sect);
-                       } else {
-                               disk_stat_inc(disk, reads);
-                               disk_stat_add(disk, read_ticks, duration);
-                               disk_stat_add(disk, read_sectors, n_sect);
-                       }
+                       disk_stat_inc(disk, ios[rw]);
+                       disk_stat_add(disk, ticks[rw], duration);
+                       disk_stat_add(disk, sectors[rw], n_sect);
                        disk_stat_add(disk, io_ticks, duration);
                        n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
                        bio_endio(buf->bio, buf->bio->bi_size, n);