From b9b666f462765c39aa1ddaba84648d7a2b4bf647 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Wed, 6 Jun 2012 19:35:55 -0500
Subject: [PATCH] --- yaml --- r: 320275 b: refs/heads/master c:
 43643528cce60ca184fe8197efa8e8da7c89a037 h: refs/heads/master i:   320273:
 64473ab497d9d72a8fa0269c8e111ffa0429fb12   320271:
 8a19e7624f58a221ccdbc4165c289eab2d883516 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fa80981d58e..ee15664e7abd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8921d114f5574c6da2cdd00749d185633ecf88f3
+refs/heads/master: 43643528cce60ca184fe8197efa8e8da7c89a037
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 3857f815c035..769a2c9fe1af 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -649,6 +649,10 @@ static void prepare_write_message(struct ceph_connection *con)
 		m->hdr.seq = cpu_to_le64(++con->out_seq);
 		m->needs_out_seq = false;
 	}
+#ifdef CONFIG_BLOCK
+	else
+		m->bio_iter = NULL;
+#endif
 
 	dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n",
 	     m, con->out_seq, le16_to_cpu(m->hdr.type),