---

yaml --- r: 320275 b: refs/heads/master c: 4364352 h: refs/heads/master i: 320273: 64473ab 320271: 8a19e76 v: v3
git-mirror · Jun 7, 2012 · b9b666f · b9b666f
1 parent 607cb57
commit b9b666f
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: 8921d114f5574c6da2cdd00749d185633ecf88f3
+refs/heads/master: 43643528cce60ca184fe8197efa8e8da7c89a037
diff --git 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),