Commit 2e8cb100 authored by Sage Weil's avatar Sage Weil

libceph: drop gratuitous socket close calls in con_work

If the state is CLOSED or OPENING, we shouldn't have a socket.
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent a59b55a6
...@@ -2284,15 +2284,15 @@ static void con_work(struct work_struct *work) ...@@ -2284,15 +2284,15 @@ static void con_work(struct work_struct *work)
dout("con_work %p STANDBY\n", con); dout("con_work %p STANDBY\n", con);
goto done; goto done;
} }
if (test_bit(CLOSED, &con->state)) { /* e.g. if we are replaced */ if (test_bit(CLOSED, &con->state)) {
dout("con_work CLOSED\n"); dout("con_work %p CLOSED\n", con);
con_close_socket(con); BUG_ON(con->sock);
goto done; goto done;
} }
if (test_and_clear_bit(OPENING, &con->state)) { if (test_and_clear_bit(OPENING, &con->state)) {
/* reopen w/ new peer */ /* reopen w/ new peer */
dout("con_work OPENING\n"); dout("con_work OPENING\n");
con_close_socket(con); BUG_ON(con->sock);
} }
ret = try_read(con); ret = try_read(con);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment