blkcg: move blkio_group_conf->weight to cfq

[sfrench/cifs-2.6.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index e368dd00b8cf0e0188f74e4f466c1a174b70adcb..386db2974a08e71e66e471e6f21c6de8fa0fe4b7 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -29,6 +29,11 @@ enum blkio_policy_id {
 
 #ifdef CONFIG_BLK_CGROUP
 
+/* CFQ specific, out here for blkcg->cfq_weight */
+#define CFQ_WEIGHT_MIN         10
+#define CFQ_WEIGHT_MAX         1000
+#define CFQ_WEIGHT_DEFAULT     500
+
 /* cft->private [un]packing for stat printing */
 #define BLKCG_STAT_PRIV(pol, off)      (((unsigned)(pol) << 16) | (off))
 #define BLKCG_STAT_POL(prv)            ((unsigned)(prv) >> 16)
@@ -46,12 +51,14 @@ enum blkg_rwstat_type {
 
 struct blkio_cgroup {
        struct cgroup_subsys_state css;
-       unsigned int weight;
        spinlock_t lock;
        struct hlist_head blkg_list;
 
        /* for policies to test whether associated blkcg has changed */
        uint64_t id;
+
+       /* TODO: per-policy storage in blkio_cgroup */
+       unsigned int cfq_weight;        /* belongs to cfq */
 };
 
 struct blkg_stat {
@@ -65,7 +72,6 @@ struct blkg_rwstat {
 };
 
 struct blkio_group_conf {
-       unsigned int weight;
        u64 iops[2];
        u64 bps[2];
 };
@@ -355,10 +361,6 @@ static inline void blkg_put(struct blkio_group *blkg) { }
 
 #endif
 
-#define BLKIO_WEIGHT_MIN       10
-#define BLKIO_WEIGHT_MAX       1000
-#define BLKIO_WEIGHT_DEFAULT   500
-
 #ifdef CONFIG_BLK_CGROUP
 extern struct blkio_cgroup blkio_root_cgroup;
 extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup);