projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPARC64]: Kill cpudata->idle_volume.
[powerpc.git]
/
include
/
linux
/
genhd.h
diff --git
a/include/linux/genhd.h
b/include/linux/genhd.h
index
01796c4
..
eef5ccd
100644
(file)
--- 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;
sector_t start_sect;
sector_t nr_sects;
struct kobject kobj;
- unsigned
reads, read_sectors, writes, write_sectors;
+ unsigned
ios[2], sectors[2]; /* READs and WRITEs */
int policy, partno;
};
int policy, partno;
};
@@
-89,10
+89,10
@@
struct hd_struct {
#define GENHD_FL_SUPPRESS_PARTITION_INFO 32
struct disk_stats {
#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]; /* READs and WRITEs */
+ unsigned
ios[2]
;
+ unsigned
merges[2]
;
+ unsigned
ticks[2]
;
unsigned io_ticks;
unsigned time_in_queue;
};
unsigned io_ticks;
unsigned time_in_queue;
};
@@
-119,7
+119,7
@@
struct gendisk {
int policy;
atomic_t sync_io; /* RAID */
int policy;
atomic_t sync_io; /* RAID */
- unsigned long stamp
, stamp_idle
;
+ unsigned long stamp;
int in_flight;
#ifdef CONFIG_SMP
struct disk_stats *dkstats;
int in_flight;
#ifdef CONFIG_SMP
struct disk_stats *dkstats;
@@
-132,6
+132,7
@@
struct gendisk {
struct disk_attribute {
struct attribute attr;
ssize_t (*show)(struct gendisk *, char *);
struct disk_attribute {
struct attribute attr;
ssize_t (*show)(struct gendisk *, char *);
+ ssize_t (*store)(struct gendisk *, const char *, size_t);
};
/*
};
/*