diff options
Diffstat (limited to 'block/genhd.c')
-rw-r--r-- | block/genhd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/block/genhd.c b/block/genhd.c index cbf1112a885c..c91a2dac6b6b 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -1158,14 +1158,14 @@ static int diskstats_show(struct seq_file *seqf, void *v) | |||
1158 | "%u %lu %lu %llu %u %u %u %u\n", | 1158 | "%u %lu %lu %llu %u %u %u %u\n", |
1159 | MAJOR(part_devt(hd)), MINOR(part_devt(hd)), | 1159 | MAJOR(part_devt(hd)), MINOR(part_devt(hd)), |
1160 | disk_name(gp, hd->partno, buf), | 1160 | disk_name(gp, hd->partno, buf), |
1161 | part_stat_read(hd, ios[0]), | 1161 | part_stat_read(hd, ios[READ]), |
1162 | part_stat_read(hd, merges[0]), | 1162 | part_stat_read(hd, merges[READ]), |
1163 | (unsigned long long)part_stat_read(hd, sectors[0]), | 1163 | (unsigned long long)part_stat_read(hd, sectors[READ]), |
1164 | jiffies_to_msecs(part_stat_read(hd, ticks[0])), | 1164 | jiffies_to_msecs(part_stat_read(hd, ticks[READ])), |
1165 | part_stat_read(hd, ios[1]), | 1165 | part_stat_read(hd, ios[WRITE]), |
1166 | part_stat_read(hd, merges[1]), | 1166 | part_stat_read(hd, merges[WRITE]), |
1167 | (unsigned long long)part_stat_read(hd, sectors[1]), | 1167 | (unsigned long long)part_stat_read(hd, sectors[WRITE]), |
1168 | jiffies_to_msecs(part_stat_read(hd, ticks[1])), | 1168 | jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])), |
1169 | part_in_flight(hd), | 1169 | part_in_flight(hd), |
1170 | jiffies_to_msecs(part_stat_read(hd, io_ticks)), | 1170 | jiffies_to_msecs(part_stat_read(hd, io_ticks)), |
1171 | jiffies_to_msecs(part_stat_read(hd, time_in_queue)) | 1171 | jiffies_to_msecs(part_stat_read(hd, time_in_queue)) |
@@ -1494,7 +1494,7 @@ void disk_block_events(struct gendisk *disk) | |||
1494 | void disk_unblock_events(struct gendisk *disk) | 1494 | void disk_unblock_events(struct gendisk *disk) |
1495 | { | 1495 | { |
1496 | if (disk->ev) | 1496 | if (disk->ev) |
1497 | __disk_unblock_events(disk, true); | 1497 | __disk_unblock_events(disk, false); |
1498 | } | 1498 | } |
1499 | 1499 | ||
1500 | /** | 1500 | /** |