From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 14 Aug 2008 11:12:15 +0000 (+0200)
Subject: highmem: use bio_has_data() in the bounce path
X-Git-Tag: v2.6.28-rc1~733^2~127
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=36144077bce9f89763ce994bc631cbd1c9db7785;p=linux-2.6-omap-h63xx.git

highmem: use bio_has_data() in the bounce path

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/mm/bounce.c b/mm/bounce.c
index b6d2d0f1019..06722c40305 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -267,7 +267,7 @@ void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig)
 	/*
 	 * Data-less bio, nothing to bounce
 	 */
-	if (bio_empty_barrier(*bio_orig))
+	if (!bio_has_data(*bio_orig))
 		return;
 
 	/*