Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux-beck.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 5480adedd387bc966bb397248a350654b0e724fd..cbb7f943f78a170c12d97429ce582562e97b4485 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -204,7 +204,7 @@ static inline struct blkcg *bio_blkcg(struct bio *bio)
  */
 static inline struct blkcg *blkcg_parent(struct blkcg *blkcg)
 {
-       return css_to_blkcg(css_parent(&blkcg->css));
+       return css_to_blkcg(blkcg->css.parent);
 }
 
 /**