blkcg: BLKIO_STAT_CPU_SECTORS doesn't have subcounters

BLKIO_STAT_CPU_SECTORS doesn't need read/write/sync/async subcounters
and is counted by blkio_group_stats_cpu->sectors; however, it still
holds a member in blkio_group_stats_cpu->stat_arr_cpu.

Rearrange stat_type_cpu and define BLKIO_STAT_CPU_ARR_NR and use it
for stat_arr_cpu[] size so that only SERVICE_BYTES and SERVICED have
subcounters.

Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 1add3dcfc19d0305d08438274b1a8a1d9ddada81..2060d812ae8e130d9372e97acef8805759e7db36 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -58,14 +58,17 @@ enum stat_type {
 
 /* Per cpu stats */
 enum stat_type_cpu {
-       BLKIO_STAT_CPU_SECTORS,
        /* Total bytes transferred */
        BLKIO_STAT_CPU_SERVICE_BYTES,
        /* Total IOs serviced, post merge */
        BLKIO_STAT_CPU_SERVICED,
-       BLKIO_STAT_CPU_NR
+
+       /* All the single valued stats go below this */
+       BLKIO_STAT_CPU_SECTORS,
 };
 
+#define BLKIO_STAT_CPU_ARR_NR  (BLKIO_STAT_CPU_SERVICED + 1)
+
 enum stat_sub_type {
        BLKIO_STAT_READ = 0,
        BLKIO_STAT_WRITE,
@@ -167,7 +170,7 @@ struct blkio_group_stats {
 /* Per cpu blkio group stats */
 struct blkio_group_stats_cpu {
        uint64_t sectors;
-       uint64_t stat_arr_cpu[BLKIO_STAT_CPU_NR][BLKIO_STAT_TOTAL];
+       uint64_t stat_arr_cpu[BLKIO_STAT_CPU_ARR_NR][BLKIO_STAT_TOTAL];
        struct u64_stats_sync syncp;
 };