Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6

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

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 5c9c7c1a3d4cfd42e35caa5d662ba1742c6fd995..326ca3876b685f9243aafbea06cfd43c00b654a0 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -468,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);