summaryrefslogtreecommitdiff
path: root/net/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-20 15:40:04 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:40 -0800
commit1c5b33b852ab372d4538821db998561d5e4d7212 (patch)
treedcf41fdf7db2bb2e9a32ddfe66b07121ee2eb903 /net/ceph
parent5d0f354b3183d005024d43b567335701d928995a (diff)
downloadlinux-3.10-1c5b33b852ab372d4538821db998561d5e4d7212.tar.gz
linux-3.10-1c5b33b852ab372d4538821db998561d5e4d7212.tar.bz2
linux-3.10-1c5b33b852ab372d4538821db998561d5e4d7212.zip
libceph: drop gratuitous socket close calls in con_work
(cherry picked from commit 2e8cb10063820af7ed7638e3fd9013eee21266e7) If the state is CLOSED or OPENING, we shouldn't have a socket. Signed-off-by: Sage Weil <sage@inktank.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/messenger.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index cb871fc7286..7bd757cb01a 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2284,15 +2284,15 @@ restart:
dout("con_work %p STANDBY\n", con);
goto done;
}
- if (test_bit(CLOSED, &con->state)) { /* e.g. if we are replaced */
- dout("con_work CLOSED\n");
- con_close_socket(con);
+ if (test_bit(CLOSED, &con->state)) {
+ dout("con_work %p CLOSED\n", con);
+ BUG_ON(con->sock);
goto done;
}
if (test_and_clear_bit(OPENING, &con->state)) {
/* reopen w/ new peer */
dout("con_work OPENING\n");
- con_close_socket(con);
+ BUG_ON(con->sock);
}
ret = try_read(con);