Merge tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block

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

diff --git a/block/bio.c b/block/bio.c
index 8281bfcbc265a211302e5cf0195002f35eab6c3c..4db1008309edd9c6ca8113afb553aad969de5b85 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -2097,8 +2097,12 @@ EXPORT_SYMBOL_GPL(bio_associate_blkg);
  */
 void bio_clone_blkg_association(struct bio *dst, struct bio *src)
 {
+       rcu_read_lock();
+
        if (src->bi_blkg)
                __bio_associate_blkg(dst, src->bi_blkg);
+
+       rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(bio_clone_blkg_association);
 #endif /* CONFIG_BLK_CGROUP */