Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

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

diff --git a/mm/bounce.c b/mm/bounce.c
index 3b549bf31f7dc474996bf30a0401eea82b490466..b6d2d0f1019b3975640a5b0388825b44112be7de 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -264,6 +264,12 @@ void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig)
 {
        mempool_t *pool;
 
+       /*
+        * Data-less bio, nothing to bounce
+        */
+       if (bio_empty_barrier(*bio_orig))
+               return;
+
        /*
         * for non-isa bounce case, just check if the bounce pfn is equal
         * to or bigger than the highest pfn in the system -- in that case,