From: Sage Weil <sage@newdream.net>
Date: Tue, 1 Apr 2008 22:46:20 +0000 (-0700)
Subject: Merge branch 'unstable' into io
X-Git-Tag: v0.2~229
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=903e3c6fbcc5f008b2fd5cd7f86cf732ce94798e;p=ceph.git

Merge branch 'unstable' into io

Conflicts:

	src/kernel/messenger.c
---

903e3c6fbcc5f008b2fd5cd7f86cf732ce94798e
diff --cc src/kernel/messenger.c
index 6fbfed4d5ad,1dcaa09d57e..a999d466913
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@@ -676,12 -669,10 +666,11 @@@ static int read_message_partial(struct 
  	while (con->in_msg_pos.data_pos < data_len) {
  		left = min((int)(data_len - con->in_msg_pos.data_pos),
  			   (int)(PAGE_SIZE - con->in_msg_pos.page_pos));
- 		/*dout(10, "data_pos = %d, data_len = %d, page_pos=%d left = %d\n", 
- 		  con->in_msg_pos.data_pos, m->hdr.data_len, con->in_msg_pos.page_pos, left);*/
  		p = kmap(m->pages[con->in_msg_pos.page]);
- 		ret = ceph_tcp_recvmsg(con->sock, p + con->in_msg_pos.page_pos, left);
- 		if (ret <= 0)
+ 		ret = ceph_tcp_recvmsg(con->sock, p + con->in_msg_pos.page_pos,
+ 				       left);
 -		if (ret <= 0) return ret;
++		if (ret <= 0) 
 +			return ret;
  		con->in_msg_pos.data_pos += ret;
  		con->in_msg_pos.page_pos += ret;
  		if (con->in_msg_pos.page_pos == PAGE_SIZE) {