From b0120d41860fb27d1932153382bfbb2ea6c0d2be Mon Sep 17 00:00:00 2001 From: Liu Yuan Date: Wed, 2 Mar 2011 11:00:15 -0500 Subject: [PATCH] --- yaml --- r: 242243 b: refs/heads/master c: 53f22956effe1c9e7961b8c6e4362ecca5e460b7 h: refs/heads/master i: 242241: ec999ce525dd27512361f81bbbb188bc84e793cf 242239: 7dab264f53ff7078c2cae9b3c2adb33158013e8b v: v3 --- [refs] | 2 +- trunk/block/genhd.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b26acb0e806b..394ff8ccac29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bbfeb8320421989d3e12bd95fae86b9ac0712aa +refs/heads/master: 53f22956effe1c9e7961b8c6e4362ecca5e460b7 diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 6a5b772aa201..73d85a8e3c85 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -1158,14 +1158,14 @@ static int diskstats_show(struct seq_file *seqf, void *v) "%u %lu %lu %llu %u %u %u %u\n", MAJOR(part_devt(hd)), MINOR(part_devt(hd)), disk_name(gp, hd->partno, buf), - part_stat_read(hd, ios[0]), - part_stat_read(hd, merges[0]), - (unsigned long long)part_stat_read(hd, sectors[0]), - jiffies_to_msecs(part_stat_read(hd, ticks[0])), - part_stat_read(hd, ios[1]), - part_stat_read(hd, merges[1]), - (unsigned long long)part_stat_read(hd, sectors[1]), - jiffies_to_msecs(part_stat_read(hd, ticks[1])), + part_stat_read(hd, ios[READ]), + part_stat_read(hd, merges[READ]), + (unsigned long long)part_stat_read(hd, sectors[READ]), + jiffies_to_msecs(part_stat_read(hd, ticks[READ])), + part_stat_read(hd, ios[WRITE]), + part_stat_read(hd, merges[WRITE]), + (unsigned long long)part_stat_read(hd, sectors[WRITE]), + jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])), part_in_flight(hd), jiffies_to_msecs(part_stat_read(hd, io_ticks)), jiffies_to_msecs(part_stat_read(hd, time_in_queue))