Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Enhanced partition statistics: documentation update
  Enhanced partition statistics: remove old partition statistics
  Enhanced partition statistics: procfs
  Enhanced partition statistics: sysfs
  Enhanced partition statistics: aoe fix
  Enhanced partition statistics: update partition statitics
  Enhanced partition statistics: core statistics
  block: fixup rq_init() a bit

Manually fixed conflict in drivers/block/aoe/aoecmd.c due to statistics
support.

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 44beb17e8090..d00293ba3b45 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -751,15 +751,15 @@ gettgt(struct aoedev *d, char *addr)
 }
 
 static inline void
-diskstats(struct gendisk *disk, struct bio *bio, ulong duration)
+diskstats(struct gendisk *disk, struct bio *bio, ulong duration, sector_t sector)
 {
         unsigned long n_sect = bio->bi_size >> 9;
         const int rw = bio_data_dir(bio);
 
-        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);
+        all_stat_inc(disk, ios[rw], sector);
+        all_stat_add(disk, ticks[rw], duration, sector);
+        all_stat_add(disk, sectors[rw], n_sect, sector);
+        all_stat_add(disk, io_ticks, duration, sector);
 }
 
 void
@@ -879,7 +879,7 @@ aoecmd_ata_rsp(struct sk_buff *skb)
         }
 
         if (buf && --buf->nframesout == 0 && buf->resid == 0) {
-                diskstats(d->gd, buf->bio, jiffies - buf->stime);
+                diskstats(d->gd, buf->bio, jiffies - buf->stime, buf->sector);
                 n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
                 bio_endio(buf->bio, n);
                 mempool_free(buf, d->bufpool);