---

yaml --- r: 311211 b: refs/heads/master c: b132cf4 h: refs/heads/master i: 311209: 77ae5b3 311207: 2fa6e49 v: v3
git-mirror · Jun 20, 2012 · f6a022f · f6a022f
1 parent f75fc5a
commit f6a022f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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),