Commit a8d00e3c authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

libceph: SOCK_CLOSED is a flag, not a state

The following commit changed it so SOCK_CLOSED bit was stored in
a connection's new "flags" field rather than its "state" field.

    libceph: start separating connection flags from state
    commit 928443cd

That bit is used in con_close_socket() to protect against setting an
error message more than once in the socket event handler function.

Unfortunately, the field being operated on in that function was not
updated to be "flags" as it should have been.  This fixes that
error.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent abdaa6a8
...@@ -397,11 +397,11 @@ static int con_close_socket(struct ceph_connection *con) ...@@ -397,11 +397,11 @@ static int con_close_socket(struct ceph_connection *con)
dout("con_close_socket on %p sock %p\n", con, con->sock); dout("con_close_socket on %p sock %p\n", con, con->sock);
if (!con->sock) if (!con->sock)
return 0; return 0;
set_bit(SOCK_CLOSED, &con->state); set_bit(SOCK_CLOSED, &con->flags);
rc = con->sock->ops->shutdown(con->sock, SHUT_RDWR); rc = con->sock->ops->shutdown(con->sock, SHUT_RDWR);
sock_release(con->sock); sock_release(con->sock);
con->sock = NULL; con->sock = NULL;
clear_bit(SOCK_CLOSED, &con->state); clear_bit(SOCK_CLOSED, &con->flags);
con_sock_state_closed(con); con_sock_state_closed(con);
return rc; return rc;
} }
......
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