---

yaml --- r: 347562 b: refs/heads/master c: 7246240 h: refs/heads/master v: v3
git-mirror · Oct 26, 2012 · 05923e1 · 05923e1
1 parent 4e99acd
commit 05923e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f9831a89310cebba52d3f526e6cc5c2e403e6f1
+refs/heads/master: 7246240c7c186542f73af4fadc744d66440f616f
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -2742,7 +2742,8 @@ static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip)
 		msg = con->ops->alloc_msg(con, hdr, skip);
 		mutex_lock(&con->mutex);
 		if (con->state != CON_STATE_OPEN) {
-			ceph_msg_put(msg);
+			if (msg)
+				ceph_msg_put(msg);
 			return -EAGAIN;
 		}
 		con->in_msg = msg;