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>

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3a4330371d88b774a740be788e6398014f5ac3d9..39653944f21b0d87924fb7b27d894aa8483ca282 100644 (file)
--- 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;
 }