---

yaml --- r: 373380 b: refs/heads/master c: 61fcdc9 h: refs/heads/master v: v3
git-mirror · May 2, 2013 · b65c8df · b65c8df
1 parent b65c07d
commit b65c8df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 878efabd3236abaedd0a4539bbb248ac69fed115
+refs/heads/master: 61fcdc97c06bce7b6d16dd2a6b478f24cd121d96
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -1512,13 +1512,10 @@ static int write_partial_message_data(struct ceph_connection *con)
 							&length, &last_piece);
 #endif
 		} else {
-			size_t resid = data_len - msg_pos->data_pos;
-
-			page = zero_page;
-			page_offset = msg_pos->page_pos;
-			length = PAGE_SIZE - page_offset;
-			length = min(resid, length);
-			last_piece = length == resid;
+			WARN(1, "con %p data_len %u but no outbound data\n",
+				con, data_len);
+			ret = -EINVAL;
+			goto out;
 		}
 		if (do_datacrc && !msg_pos->did_page_crc) {
 			u32 crc = le32_to_cpu(msg->footer.data_crc);