Revert "usb: dwc3: turn off VBUS when leaving host mode"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index cf513f7..13526f3 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -31,6 +31,8 @@
 
 #include <trace/events/block.h>
 
+#include "blk.h"
+
 /*
  * Test patch to inline a certain number of bi_io_vec's inside the bio
  * itself, to shrink a bio data allocation from two mempool calls to one
@@ -590,6 +592,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
        bio->bi_rw = bio_src->bi_rw;
        bio->bi_iter = bio_src->bi_iter;
        bio->bi_io_vec = bio_src->bi_io_vec;
+       bio->bi_dio_inode = bio_src->bi_dio_inode;
 
        bio_clone_blkcg_association(bio, bio_src);
 }
@@ -1785,8 +1788,10 @@ void bio_endio(struct bio *bio)
                        bio_put(bio);
                        bio = parent;
                } else {
-                       if (bio->bi_end_io)
+                       if (bio->bi_end_io) {
+                               blk_update_perf_stats(bio);
                                bio->bi_end_io(bio);
+                       }
                        bio = NULL;
                }
        }