From 823290f2c20d28b3e9431129890e799a2a2c344d Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Wed, 21 Dec 2011 15:27:24 +0100
Subject: [PATCH] --- yaml --- r: 277031 b: refs/heads/master c:
 609f6ea1c9cdfe0c43a927e13205a57d0c266d5a h: refs/heads/master i:   277029:
 362a2f1c65bbaa870e2c476ddbc1b6f901794b24   277027:
 31b196c6f7d81c30ed8b5dfa1a866a22849c888c   277023:
 052297a41fa0a327034666d9e9b0c4a009204194 v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-map.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 303d0a6c0f5a..8e6c3a1abb5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ae0516b8a50ece5d766be608a305707e0450060
+refs/heads/master: 609f6ea1c9cdfe0c43a927e13205a57d0c266d5a
diff --git a/trunk/block/blk-map.c b/trunk/block/blk-map.c
index 164cd0059706..623e1cd4cffe 100644
--- a/trunk/block/blk-map.c
+++ b/trunk/block/blk-map.c
@@ -311,7 +311,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
 	if (IS_ERR(bio))
 		return PTR_ERR(bio);
 
-	if (rq_data_dir(rq) == WRITE)
+	if (!reading)
 		bio->bi_rw |= REQ_WRITE;
 
 	if (do_copy)