diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 08:06:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 08:06:02 -0800 |
commit | ec1890c5df451799dec969a3581ff72e1934b5ee (patch) | |
tree | 38e84a95297dc9c6b727b73925d5c273d110fdbe /include | |
parent | ca23509fbaac0ea662ab0e287bebb72f743f9e1f (diff) | |
parent | 496456c24f1f4280d50b81aa5bf439ab440b3d7e (diff) | |
download | linux-3.10-ec1890c5df451799dec969a3581ff72e1934b5ee.tar.gz linux-3.10-ec1890c5df451799dec969a3581ff72e1934b5ee.tar.bz2 linux-3.10-ec1890c5df451799dec969a3581ff72e1934b5ee.zip |
Merge git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/genhd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index eabdb5cce35..8eeaa53a68c 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -78,7 +78,7 @@ struct hd_struct { sector_t start_sect; sector_t nr_sects; struct kobject kobj; - unsigned reads, read_sectors, writes, write_sectors; + unsigned ios[2], sectors[2]; int policy, partno; }; @@ -89,10 +89,10 @@ struct hd_struct { #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 struct disk_stats { - unsigned read_sectors, write_sectors; - unsigned reads, writes; - unsigned read_merges, write_merges; - unsigned read_ticks, write_ticks; + unsigned sectors[2]; + unsigned ios[2]; + unsigned merges[2]; + unsigned ticks[2]; unsigned io_ticks; unsigned time_in_queue; }; |