From 184808fc4a10e33009bffdbdce5eaecea6f37606 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 20 Jun 2012 21:53:53 -0500 Subject: [PATCH] --- yaml --- r: 320291 b: refs/heads/master c: a8d00e3cdef4c1c4f194414b72b24cd995439a05 h: refs/heads/master i: 320289: 63176797776c9fa283d5d6f9f6d89d1bc7f5670d 320287: a39c023d583e8256c98da6a4e81d7f5846a93347 v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; }