From 898734a73febd210d195d65e5b5b3ffe7e90929f Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 14 Aug 2008 13:12:15 +0200
Subject: [PATCH] --- yaml --- r: 110445 b: refs/heads/master c:
 36144077bce9f89763ce994bc631cbd1c9db7785 h: refs/heads/master i:   110443:
 6800dbf2e069610a2305d771a0ce931218522d00 v: v3

---
 [refs]            | 2 +-
 trunk/mm/bounce.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5df09ef17d4c..5dbc1d0f6935 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 051cc3952a8fb6fa875a4eff68d06cf42207dcf4
+refs/heads/master: 36144077bce9f89763ce994bc631cbd1c9db7785
diff --git a/trunk/mm/bounce.c b/trunk/mm/bounce.c
index b6d2d0f1019b..06722c403058 100644
--- a/trunk/mm/bounce.c
+++ b/trunk/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;
 
 	/*