---

yaml --- r: 296524 b: refs/heads/master c: e36b13c h: refs/heads/master v: v3
git-mirror · Mar 22, 2012 · 170c38b · 170c38b
1 parent b3dfd15
commit 170c38b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31739139f3ed7be802dd9019ec8d8cc910e3d241
+refs/heads/master: e36b13cceb46136d849aeee06b4907ad3570ba78
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -904,17 +904,13 @@ static int write_partial_msg_pages(struct ceph_connection *con)
 			con->out_msg->footer.data_crc = cpu_to_le32(crc);
 			con->out_msg_pos.did_page_crc = true;
 		}
-		ret = kernel_sendpage(con->sock, page,
+		ret = ceph_tcp_sendpage(con->sock, page,
 				      con->out_msg_pos.page_pos + page_shift,
-				      len,
-				      MSG_DONTWAIT | MSG_NOSIGNAL |
-				      MSG_MORE);
+				      len, 1);
 
 		if (do_datacrc && kaddr != zero_page_address)
 			kunmap(page);
 
-		if (ret == -EAGAIN)
-			ret = 0;
 		if (ret <= 0)
 			goto out;