From f6a022fa8c5894b65a7680063880a21663dc4139 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: 311211 b: refs/heads/master c:
 b132cf4c733f91bb4dd2277ea049243cf16e8b66 h: refs/heads/master i:   311209:
 77ae5b3779cba8ffc052986cc7534e0330bb0f9b   311207:
 2fa6e49d6cc8dbd4a99b0491b84cf95c247db0ee v: v3

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

diff --git a/[refs] b/[refs]
index b7cadaee7564..601065dd67ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88ed6ea0b295f8e2383d599a04027ec596cdf97b
+refs/heads/master: b132cf4c733f91bb4dd2277ea049243cf16e8b66
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 524f4e4f598b..b332c3d76059 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -563,6 +563,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),