From 05923e10451d0cfd6c7e674c588abfa28a5ebe8b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Thu, 25 Oct 2012 08:49:41 -0700
Subject: [PATCH] --- yaml --- r: 347562 b: refs/heads/master c:
 7246240c7c186542f73af4fadc744d66440f616f h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a439d068f28f..807c523e39be 100644
--- 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
index 66f6f56bcb23..1041114453db 100644
--- 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;