From patchwork Tue Nov 20 17:14:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.yuz, extended, stable] Patch "libceph: eliminate connection state "DEAD"" has been added to staging queue Date: Tue, 20 Nov 2012 07:14:51 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 200408 Message-Id: <1353431691-6930-1-git-send-email-herton.krzesinski@canonical.com> To: Alex Elder Cc: kernel-team@lists.ubuntu.com, Yehuda Sadeh This is a note to let you know that I have just added a patch titled libceph: eliminate connection state "DEAD" to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.yuz tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 3046bb86a81023bd0f74b45fe943ad4156eca82c Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Tue, 22 May 2012 11:41:43 -0500 Subject: [PATCH 01/78] libceph: eliminate connection state "DEAD" commit e5e372da9a469dfe3ece40277090a7056c566838 upstream. The ceph connection state "DEAD" is never set and is therefore not needed. Eliminate it. Signed-off-by: Alex Elder Reviewed-by: Yehuda Sadeh Signed-off-by: Herton Ronaldo Krzesinski --- include/linux/ceph/messenger.h | 1 - net/ceph/messenger.c | 6 ------ 2 files changed, 7 deletions(-) -- 1.7.9.5 diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 44c87e7..6a1dc80 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -119,7 +119,6 @@ struct ceph_msg_pos { #define CLOSED 10 /* we've closed the connection */ #define SOCK_CLOSED 11 /* socket state changed to closed */ #define OPENING 13 /* open connection w/ (possibly new) peer */ -#define DEAD 14 /* dead, about to kfree */ #define BACKOFF 15 /* diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 10255e8..ad2eaad 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2091,12 +2091,6 @@ bad_tag: */ static void queue_con(struct ceph_connection *con) { - if (test_bit(DEAD, &con->state)) { - dout("queue_con %p ignoring: DEAD\n", - con); - return; - } - if (!con->ops->get(con)) { dout("queue_con %p ref count 0\n", con); return;