Merge commit '818299f6bdae' into android-exynos-4.14-ww-9610-minor_up-dev

[GitHub/LineageOS/android_kernel_motorola_exynos9610.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index 90f19d7df66cf73ce80e8eade310105bfa17ba3d..f33eaa4bda827f24be80dd19119805605def47c5 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -605,6 +605,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
        bio->bi_write_hint = bio_src->bi_write_hint;
        bio->bi_iter = bio_src->bi_iter;
        bio->bi_io_vec = bio_src->bi_io_vec;
+       bio->bi_aux_private = bio_src->bi_aux_private;
 
        bio_clone_blkcg_association(bio, bio_src);
 }
@@ -689,6 +690,7 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask,
        bio->bi_write_hint      = bio_src->bi_write_hint;
        bio->bi_iter.bi_sector  = bio_src->bi_iter.bi_sector;
        bio->bi_iter.bi_size    = bio_src->bi_iter.bi_size;
+       bio->bi_aux_private = bio_src->bi_aux_private;
 
        switch (bio_op(bio)) {
        case REQ_OP_DISCARD: