---

yaml --- r: 188651 b: refs/heads/master c: b3d1dbb h: refs/heads/master i: 188649: d176e68 188647: 394543b v: v3
git-mirror · Dec 22, 2009 · 5bb31df · 5bb31df
1 parent c8fbc67
commit 5bb31df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ac41d0a4ab26fb68d3f841332e5d1f15d79123
+refs/heads/master: b3d1dbbdd5670d8a9fb01f7dfb1cac522ff6795a
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
@@ -453,12 +453,16 @@ static void prepare_write_message(struct ceph_connection *con)
 		con->out_kvec_bytes = 1 + sizeof(con->out_temp_ack);
 	}
 
-	/* move message to sending/sent list */
 	m = list_first_entry(&con->out_queue,
 		       struct ceph_msg, list_head);
 	con->out_msg = m;
-	ceph_msg_get(m);
-	list_move_tail(&m->list_head, &con->out_sent);
+	if (test_bit(LOSSYTX, &con->state)) {
+		/* put message on sent list */
+		ceph_msg_get(m);
+		list_move_tail(&m->list_head, &con->out_sent);
+	} else {
+		list_del_init(&m->list_head);
+	}
 
 	m->hdr.seq = cpu_to_le64(++con->out_seq);