diff options
| author | Alex Elder <elder@inktank.com> | 2012-06-21 04:53:53 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-06 06:14:19 +0200 |
| commit | a8d00e3cdef4c1c4f194414b72b24cd995439a05 (patch) | |
| tree | 26ba315db9d4b5caff1bd30125fe3edcbfb49937 /net/ceph | |
| parent | libceph: don't use bio_iter as a flag (diff) | |
| download | linux-a8d00e3cdef4c1c4f194414b72b24cd995439a05.tar.xz linux-a8d00e3cdef4c1c4f194414b72b24cd995439a05.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3a4330371d88..39653944f21b 100644 --- a/net/ceph/messenger.c +++ b/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; } |