1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index fdfd04e348f6..738a0c24874f 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -246,7 +246,8 @@ static inline void wbc_attach_fdatawrite_inode(struct writeback_control *wbc,
  *
  * @bio is a part of the writeback in progress controlled by @wbc.  Perform
  * writeback specific initialization.  This is used to apply the cgroup
- * writeback context.
+ * writeback context.  Must be called after the bio has been associated with
+ * a device.
  */
 static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio)
 {
@@ -257,7 +258,7 @@ static inline void wbc_init_bio(struct writeback_control *wbc, struct bio *bio)
          * regular writeback instead of writing things out itself.
          */
         if (wbc->wb)
-                bio_associate_blkcg(bio, wbc->wb->blkcg_css);
+                bio_associate_blkg_from_css(bio, wbc->wb->blkcg_css);
 }
 
 #else   /* CONFIG_CGROUP_WRITEBACK */