Merge branch 'perf/urgent' into perf/core to fix conflicts

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / bounce.c

diff --git a/mm/bounce.c b/mm/bounce.c
index c9f0a43..5a7d58f 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -204,6 +204,8 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
        struct bio_vec *to, *from;
        unsigned i;
 
+       if (force)
+               goto bounce;
        bio_for_each_segment(from, *bio_orig, i)
                if (page_to_pfn(from->bv_page) > queue_bounce_pfn(q))
                        goto bounce;