diff --git a/[refs] b/[refs] index d4cd53a4ba83..572b0c075f5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abdaa6a849af1d63153682c11f5bbb22dacb1f6b +refs/heads/master: a8d00e3cdef4c1c4f194414b72b24cd995439a05 diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c index 3a4330371d88..39653944f21b 100644 --- a/trunk/net/ceph/messenger.c +++ b/trunk/net/ceph/messenger.c @@ -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); if (!con->sock) return 0; - set_bit(SOCK_CLOSED, &con->state); + set_bit(SOCK_CLOSED, &con->flags); rc = con->sock->ops->shutdown(con->sock, SHUT_RDWR); sock_release(con->sock); con->sock = NULL; - clear_bit(SOCK_CLOSED, &con->state); + clear_bit(SOCK_CLOSED, &con->flags); con_sock_state_closed(con); return rc; }