summaryrefslogtreecommitdiff
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2020-11-09 16:11:26 +0300
committerIlya Dryomov <idryomov@gmail.com>2020-12-15 01:21:49 +0300
commit30be780a87211de75b93935c20a0913e46744a3f (patch)
treee54ff127cce48ec754fedf90b36da758808dadca /net/ceph/messenger.c
parent2f68738037db30733caed6ac6278ba589d152afa (diff)
downloadlinux-30be780a87211de75b93935c20a0913e46744a3f.tar.xz
libceph: make con->state an int
unsigned long is a leftover from when con->state used to be a set of bits managed with set_bit(), clear_bit(), etc. Save a bit of memory. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index bb79a59daf42..9c92f101aa88 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -372,7 +372,7 @@ static void ceph_sock_data_ready(struct sock *sk)
}
if (sk->sk_state != TCP_CLOSE_WAIT) {
- dout("%s on %p state = %lu, queueing work\n", __func__,
+ dout("%s %p state = %d, queueing work\n", __func__,
con, con->state);
queue_con(con);
}
@@ -406,7 +406,7 @@ static void ceph_sock_state_change(struct sock *sk)
{
struct ceph_connection *con = sk->sk_user_data;
- dout("%s %p state = %lu sk_state = %u\n", __func__,
+ dout("%s %p state = %d sk_state = %u\n", __func__,
con, con->state, sk->sk_state);
switch (sk->sk_state) {
@@ -2582,7 +2582,7 @@ static int try_write(struct ceph_connection *con)
{
int ret = 1;
- dout("try_write start %p state %lu\n", con, con->state);
+ dout("try_write start %p state %d\n", con, con->state);
if (con->state != CON_STATE_PREOPEN &&
con->state != CON_STATE_CONNECTING &&
con->state != CON_STATE_NEGOTIATING &&
@@ -2600,7 +2600,7 @@ static int try_write(struct ceph_connection *con)
BUG_ON(con->in_msg);
con->in_tag = CEPH_MSGR_TAG_READY;
- dout("try_write initiating connect on %p new state %lu\n",
+ dout("try_write initiating connect on %p new state %d\n",
con, con->state);
ret = ceph_tcp_connect(con);
if (ret < 0) {
@@ -2679,7 +2679,7 @@ static int try_read(struct ceph_connection *con)
int ret = -1;
more:
- dout("try_read start on %p state %lu\n", con, con->state);
+ dout("try_read start %p state %d\n", con, con->state);
if (con->state != CON_STATE_CONNECTING &&
con->state != CON_STATE_NEGOTIATING &&
con->state != CON_STATE_OPEN)
@@ -2876,11 +2876,7 @@ static bool con_sock_closed(struct ceph_connection *con)
CASE(OPEN);
CASE(STANDBY);
default:
- pr_warn("%s con %p unrecognized state %lu\n",
- __func__, con, con->state);
- con->error_msg = "unrecognized con state";
BUG();
- break;
}
#undef CASE
@@ -2998,7 +2994,7 @@ static void ceph_con_workfn(struct work_struct *work)
*/
static void con_fault(struct ceph_connection *con)
{
- dout("fault %p state %lu to peer %s\n",
+ dout("fault %p state %d to peer %s\n",
con, con->state, ceph_pr_addr(&con->peer_addr));
pr_warn("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),