From 829750fbdb0988b72efd22eded4e73316d5b64d0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 20 Jul 2012 15:34:04 -0700 Subject: [PATCH] --- yaml --- r: 320363 b: refs/heads/master c: a59b55a602b6c741052d79c1e3643f8440cddd27 h: refs/heads/master i: 320361: 10bd1917f82822c68c1a5c3001142f9d8e8ed0df 320359: 6fd72866b134296945c239d98ac416449b4b1cff v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 3b59a1cbe0fa..68f438512017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00650931e52e97fe64096bec167f5a6780dfd94a +refs/heads/master: a59b55a602b6c741052d79c1e3643f8440cddd27 diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 1a3cb4a4f180..20e60a80bc29 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -2453,22 +2453,20 @@ static void clear_standby(struct ceph_connection *con) */ void ceph_con_send(struct ceph_connection *con, struct ceph_msg *msg) { - if (test_bit(CLOSED, &con->state)) { - dout("con_send %p closed, dropping %p\n", con, msg); - ceph_msg_put(msg); - return; - } - /* set src+dst */ msg->hdr.src = con->msgr->inst.name; - BUG_ON(msg->front.iov_len != le32_to_cpu(msg->hdr.front_len)); - msg->needs_out_seq = true; - /* queue */ mutex_lock(&con->mutex); + if (test_bit(CLOSED, &con->state)) { + dout("con_send %p closed, dropping %p\n", con, msg); + ceph_msg_put(msg); + mutex_unlock(&con->mutex); + return; + } + BUG_ON(msg->con != NULL); msg->con = con->ops->get(con); BUG_ON(msg->con == NULL);