Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / block / bounce.c

diff --git a/block/bounce.c b/block/bounce.c
index 559c55bda040e2da3d2ec1bc66dacb6e7f02b829..ffb9e9ecfa7ee78f1428390a30d0667a8f778cde 100644 (file)
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -277,7 +277,8 @@ static struct bio *bounce_clone_bio(struct bio *bio_src, gfp_t gfp_mask,
                }
        }
 
-       bio_clone_blkcg_association(bio, bio_src);
+       bio_clone_blkg_association(bio, bio_src);
+       blkcg_bio_issue_init(bio);
 
        return bio;
 }