blkcg: kill blkio_policy_node

Now that blkcg configuration lives in blkg's, blkio_policy_node is no
longer necessary.  Kill it.

blkio_policy_parse_and_set() now fails if invoked for missing device
and functions to print out configurations are updated to print from
blkg's.

cftype_blkg_same_policy() is dropped along with other policy functions
for consistency.  Its one line is open coded in the only user -
blkio_read_blkg_stats().

-v2: Update to reflect the retry-on-bypass logic change of the
     previous patch.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 0 insertions, 32 deletions

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 81efe718a1c6..9a5c68d7cc92 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -112,7 +112,6 @@ struct blkio_cgroup {
         unsigned int weight;
         spinlock_t lock;
         struct hlist_head blkg_list;
-        struct list_head policy_list; /* list of blkio_policy_node */
 };
 
 struct blkio_group_stats {
@@ -182,37 +181,6 @@ struct blkio_group {
         struct blkio_group_stats_cpu __percpu *stats_cpu;
 };
 
-struct blkio_policy_node {
-        struct list_head node;
-        dev_t dev;
-        /* This node belongs to max bw policy or porportional weight policy */
-        enum blkio_policy_id plid;
-        /* cgroup file to which this rule belongs to */
-        int fileid;
-
-        union {
-                unsigned int weight;
-                /*
-                 * Rate read/write in terms of bytes per second
-                 * Whether this rate represents read or write is determined
-                 * by file type "fileid".
-                 */
-                u64 bps;
-                unsigned int iops;
-        } val;
-};
-
-extern unsigned int blkcg_get_weight(struct blkio_cgroup *blkcg,
-                                     dev_t dev);
-extern uint64_t blkcg_get_read_bps(struct blkio_cgroup *blkcg,
-                                     dev_t dev);
-extern uint64_t blkcg_get_write_bps(struct blkio_cgroup *blkcg,
-                                     dev_t dev);
-extern unsigned int blkcg_get_read_iops(struct blkio_cgroup *blkcg,
-                                     dev_t dev);
-extern unsigned int blkcg_get_write_iops(struct blkio_cgroup *blkcg,
-                                     dev_t dev);
-
 typedef struct blkio_group *(blkio_alloc_group_fn)(struct request_queue *q,
                                                    struct blkio_cgroup *blkcg);
 typedef void (blkio_link_group_fn)(struct request_queue *q,