diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
| commit | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (patch) | |
| tree | 541909f86c31fee97cd70d28ec2fe5c23e1ceb02 /include/linux/genhd.h | |
| parent | f1e691a24955ea987f021f378324fb5003b1b208 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | kernel_samsung_smdk4412-7211bb9b64f17b23834d91fc3d0c1d78671ee9a8.zip kernel_samsung_smdk4412-7211bb9b64f17b23834d91fc3d0c1d78671ee9a8.tar.gz kernel_samsung_smdk4412-7211bb9b64f17b23834d91fc3d0c1d78671ee9a8.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 142e1c1..8eeaa53 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; }; @@ -132,6 +132,7 @@ struct gendisk { struct disk_attribute { struct attribute attr; ssize_t (*show)(struct gendisk *, char *); + ssize_t (*store)(struct gendisk *, const char *, size_t); }; /* |