aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.h
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2011-05-23 04:02:19 -0400
committerJens Axboe <jaxboe@fusionio.com>2011-05-23 04:02:19 -0400
commit317389a7739675aa990b7e0d750a7c435f1d25d7 (patch)
treec24b7bb45d03233d76405dab4f9406c05c44eafa /block/blk-cgroup.h
parent2abae55f5a41d29f21b5b259c33d218c950d5c90 (diff)
cfq-iosched: Make IO merge related stats per cpu
Make BLKIO_STAT_MERGED per cpu hence gettring rid of need of taking blkg->stats_lock. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-cgroup.h')
-rw-r--r--block/blk-cgroup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 262226798093..a71d2904ffb9 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -39,8 +39,6 @@ enum stat_type {
39 BLKIO_STAT_SERVICE_TIME = 0, 39 BLKIO_STAT_SERVICE_TIME = 0,
40 /* Total time spent waiting in scheduler queue in ns */ 40 /* Total time spent waiting in scheduler queue in ns */
41 BLKIO_STAT_WAIT_TIME, 41 BLKIO_STAT_WAIT_TIME,
42 /* Number of IOs merged */
43 BLKIO_STAT_MERGED,
44 /* Number of IOs queued up */ 42 /* Number of IOs queued up */
45 BLKIO_STAT_QUEUED, 43 BLKIO_STAT_QUEUED,
46 /* All the single valued stats go below this */ 44 /* All the single valued stats go below this */
@@ -63,6 +61,8 @@ enum stat_type_cpu {
63 BLKIO_STAT_CPU_SERVICE_BYTES, 61 BLKIO_STAT_CPU_SERVICE_BYTES,
64 /* Total IOs serviced, post merge */ 62 /* Total IOs serviced, post merge */
65 BLKIO_STAT_CPU_SERVICED, 63 BLKIO_STAT_CPU_SERVICED,
64 /* Number of IOs merged */
65 BLKIO_STAT_CPU_MERGED,
66 BLKIO_STAT_CPU_NR 66 BLKIO_STAT_CPU_NR
67}; 67};
68 68