aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.h
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2011-05-19 15:38:20 -0400
committerJens Axboe <jaxboe@fusionio.com>2011-05-20 14:34:52 -0400
commita23e68695593d00b35a6cddf8e9c9ec03505ecb9 (patch)
tree954a92fb07408e4b7483881f09d2afc91002bc00 /block/blk-cgroup.h
parenta29a171e7c46c60842b85729280e2f5690372683 (diff)
blk-cgroup: move some fields of unaccounted_time file under right config option
cgroup unaccounted_time file is created only if CONFIG_DEBUG_BLK_CGROUP=y. there are some fields which are out side this config option. Fix that. 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.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index c774930cc206..63f1ef4450d7 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -49,9 +49,9 @@ enum stat_type {
49 /* All the single valued stats go below this */ 49 /* All the single valued stats go below this */
50 BLKIO_STAT_TIME, 50 BLKIO_STAT_TIME,
51 BLKIO_STAT_SECTORS, 51 BLKIO_STAT_SECTORS,
52#ifdef CONFIG_DEBUG_BLK_CGROUP
52 /* Time not charged to this cgroup */ 53 /* Time not charged to this cgroup */
53 BLKIO_STAT_UNACCOUNTED_TIME, 54 BLKIO_STAT_UNACCOUNTED_TIME,
54#ifdef CONFIG_DEBUG_BLK_CGROUP
55 BLKIO_STAT_AVG_QUEUE_SIZE, 55 BLKIO_STAT_AVG_QUEUE_SIZE,
56 BLKIO_STAT_IDLE_TIME, 56 BLKIO_STAT_IDLE_TIME,
57 BLKIO_STAT_EMPTY_TIME, 57 BLKIO_STAT_EMPTY_TIME,
@@ -117,10 +117,11 @@ struct blkio_group_stats {
117 /* total disk time and nr sectors dispatched by this group */ 117 /* total disk time and nr sectors dispatched by this group */
118 uint64_t time; 118 uint64_t time;
119 uint64_t sectors; 119 uint64_t sectors;
120 /* Time not charged to this cgroup */
121 uint64_t unaccounted_time;
122 uint64_t stat_arr[BLKIO_STAT_QUEUED + 1][BLKIO_STAT_TOTAL]; 120 uint64_t stat_arr[BLKIO_STAT_QUEUED + 1][BLKIO_STAT_TOTAL];
123#ifdef CONFIG_DEBUG_BLK_CGROUP 121#ifdef CONFIG_DEBUG_BLK_CGROUP
122 /* Time not charged to this cgroup */
123 uint64_t unaccounted_time;
124
124 /* Sum of number of IOs queued across all samples */ 125 /* Sum of number of IOs queued across all samples */
125 uint64_t avg_queue_size_sum; 126 uint64_t avg_queue_size_sum;
126 /* Count of samples taken for average */ 127 /* Count of samples taken for average */