summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2020-11-06 19:04:30 +0100
committerIlya Dryomov <idryomov@gmail.com>2020-12-14 23:21:48 +0100
commit5963c3d01c8eec73d44a93fc0807b13369ffb63c (patch)
treea34936a7a617a1b25429d15f86ef64263748afb8 /net
parentlibceph: split protocol reset bits out of reset_connection() (diff)
downloadlinux-5963c3d01c8eec73d44a93fc0807b13369ffb63c.tar.xz
linux-5963c3d01c8eec73d44a93fc0807b13369ffb63c.zip
libceph: rename reset_connection() to ceph_con_reset_session()
With just session reset bits left, rename appropriately. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/messenger.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 37166f130d44..b1a936146855 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -651,11 +651,9 @@ static void ceph_msg_remove_list(struct list_head *head)
}
}
-static void reset_connection(struct ceph_connection *con)
+static void ceph_con_reset_session(struct ceph_connection *con)
{
- /* reset connection, out_queue, msg_ and connect_seq */
- /* discard existing out_queue and msg_seq */
- dout("reset_connection %p\n", con);
+ dout("%s con %p\n", __func__, con);
WARN_ON(con->in_msg);
WARN_ON(con->out_msg);
@@ -683,7 +681,7 @@ void ceph_con_close(struct ceph_connection *con)
con_flag_clear(con, CON_FLAG_BACKOFF);
ceph_con_reset_protocol(con);
- reset_connection(con);
+ ceph_con_reset_session(con);
con->peer_global_seq = 0;
cancel_con(con);
mutex_unlock(&con->mutex);
@@ -2140,7 +2138,7 @@ static int process_connect(struct ceph_connection *con)
pr_err("%s%lld %s connection reset\n",
ENTITY_NAME(con->peer_name),
ceph_pr_addr(&con->peer_addr));
- reset_connection(con);
+ ceph_con_reset_session(con);
con_out_kvec_reset(con);
ret = prepare_write_connect(con);
if (ret < 0)