1 files changed, 2 insertions, 3 deletions

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 8056c03a3382..628e50f6f8a8 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -181,14 +181,13 @@ void blkg_conf_finish(struct blkg_conf_ctx *ctx);
 
 static inline struct blkcg *cgroup_to_blkcg(struct cgroup *cgroup)
 {
-        return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id),
+        return container_of(cgroup_css(cgroup, blkio_subsys_id),
                             struct blkcg, css);
 }
 
 static inline struct blkcg *task_blkcg(struct task_struct *tsk)
 {
-        return container_of(task_subsys_state(tsk, blkio_subsys_id),
-                            struct blkcg, css);
+        return container_of(task_css(tsk, blkio_subsys_id), struct blkcg, css);
 }
 
 static inline struct blkcg *bio_blkcg(struct bio *bio)