---

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

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c86a2930ccbd90d77c54d04b5c2bbec95b989e40
+refs/heads/master: 5e095e8b40b0402ad3bcadc5b8d84c38b26c30b2
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
@@ -1434,8 +1434,9 @@ static int read_partial_message(struct ceph_connection *con)
  */
 static void process_message(struct ceph_connection *con)
 {
-	struct ceph_msg *msg = con->in_msg;
+	struct ceph_msg *msg;
 
+	msg = con->in_msg;
 	con->in_msg = NULL;
 
 	/* if first message, set peer_name */
@@ -1810,7 +1811,11 @@ static void ceph_fault(struct ceph_connection *con)
 	clear_bit(BUSY, &con->state);  /* to avoid an improbable race */
 
 	con_close_socket(con);
-	con->in_msg = NULL;
+
+	if (con->in_msg) {
+		ceph_msg_put(con->in_msg);
+		con->in_msg = NULL;
+	}
 
 	/* If there are no messages in the queue, place the connection
 	 * in a STANDBY state (i.e., don't try to reconnect just yet). */