From: Sage Weil <sage@newdream.net>
Date: Tue, 11 Aug 2009 22:17:43 +0000 (-0700)
Subject: kclient: fix msgr incoming msg allocation stupid
X-Git-Tag: v0.13~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e55e5faae317b72d913de53f958ac00fa0f13a21;p=ceph.git

kclient: fix msgr incoming msg allocation stupid
---

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 80db6d20a231..c51220d8b8c7 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1385,7 +1385,7 @@ static void process_ack(struct ceph_connection *con)
  */
 static int read_partial_message(struct ceph_connection *con)
 {
-	struct ceph_msg *m = NULL;
+	struct ceph_msg *m = con->in_msg;
 	void *p;
 	int ret;
 	int to, want, left;
@@ -1420,20 +1420,22 @@ static int read_partial_message(struct ceph_connection *con)
 	if (front_len > CEPH_MSG_MAX_FRONT_LEN)
 		return -EIO;
 
-	dout("got hdr type %d front %d data %d\n",
-	     con->in_hdr.type, con->in_hdr.front_len, con->in_hdr.data_len);
-
-	/* allocate message */
-	con->in_msg = con->msgr->alloc_msg(con->msgr->parent, &con->in_hdr);
-	if (IS_ERR(con->in_msg)) {
-		ret = PTR_ERR(con->in_msg);
-		con->in_msg = NULL;
-		con->error_msg = "out of memory for incoming message";
-		return ret;
+	/* allocate message? */
+	if (!con->in_msg) {
+		dout("got hdr type %d front %d data %d\n", con->in_hdr.type,
+		     con->in_hdr.front_len, con->in_hdr.data_len);
+		con->in_msg = con->msgr->alloc_msg(con->msgr->parent,
+						   &con->in_hdr);
+		if (IS_ERR(con->in_msg)) {
+			ret = PTR_ERR(con->in_msg);
+			con->in_msg = NULL;
+			con->error_msg = "out of memory for incoming message";
+			return ret;
+		}
+		m = con->in_msg;
+		m->front.iov_len = 0;    /* haven't read it yet */
+		memcpy(&m->hdr, &con->in_hdr, sizeof(con->in_hdr));
 	}
-	m = con->in_msg;
-	m->front.iov_len = 0;    /* haven't read it yet */
-	memcpy(&m->hdr, &con->in_hdr, sizeof(con->in_hdr));
 
 	/* front */
 	while (m->front.iov_len < front_len) {