Skip to content

Commit 179317f

Browse files
Hakon-Buggejfvogel
authored andcommitted
rds: Rename rds_send_ping to rds_send_hs_ping
Commit 041dc3e ("Backport multipath RDS from upstream to UEK4") introduced a function called rds_send_ping(). However, this function does not send a _ping_ per se, but a special RDS MultiPath handshake probe. Renamed to avoid confusion. Orabug: 30418039 Fixes: 041dc3e ("Backport multipath RDS from upstream to UEK4") Signed-off-by: Håkon Bugge <[email protected]> Reviewed-by: Ka-Cheong Poon <[email protected]> Tested-by: Michael Nowak <[email protected]> --- v1->v2: * Added Ka-Cheong's r-b * Added Mike's t-b Signed-off-by: Somasundaram Krishnasamy <[email protected]> Orabug: 30820081 UEK5 => UEK6 (cherry picked from commit e9cbb94) cherry-pick-repo=UEK/production/linux-uek.git Signed-off-by: Gerd Rausch <[email protected]> Reviewed-by: Sharon Liu <[email protected]>
1 parent e34d2d6 commit 179317f

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

net/rds/rds.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
12391239
void rds_send_path_drop_acked(struct rds_conn_path *cp, u64 ack,
12401240
is_acked_func is_acked);
12411241
void rds_send_remove_from_sock(struct list_head *messages, int status);
1242-
void rds_send_ping(struct rds_connection *conn, int cp_index);
1242+
void rds_send_hs_ping(struct rds_connection *conn, int cp_index);
12431243
int rds_send_pong(struct rds_conn_path *cp, __be16 dport);
12441244
int rds_send_hb(struct rds_connection *conn, int response);
12451245
struct rds_message *rds_send_get_message(struct rds_connection *,

net/rds/send.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,12 +1523,12 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
15231523
rds_conn_path_down(&conn->c_path[0])) {
15241524
/* rds_connd_queue_reconnect_work() ensures
15251525
* that only one request is queued. And
1526-
* rds_send_ping() ensures that only one ping
1526+
* rds_send_hs_ping() ensures that only one ping
15271527
* is outstanding.
15281528
*/
15291529
rds_cond_queue_reconnect_work(&conn->c_path[0],
15301530
0);
1531-
rds_send_ping(conn, 0);
1531+
rds_send_hs_ping(conn, 0);
15321532
}
15331533
cpath = &conn->c_path[rds_send_mprds_hash(rs, conn)];
15341534
} else {
@@ -1803,7 +1803,7 @@ int rds_send_internal(struct rds_connection *conn, struct rds_sock *rs,
18031803
}
18041804

18051805
/*
1806-
* send out a probe. Can be shared by rds_send_ping,
1806+
* send out a probe. Can be shared by rds_send_hs_ping,
18071807
* rds_send_pong, rds_send_hb.
18081808
*/
18091809
static int rds_send_probe(struct rds_conn_path *cp, __be16 sport,
@@ -1903,8 +1903,9 @@ rds_send_pong(struct rds_conn_path *cp, __be16 dport)
19031903
return rds_send_probe(cp, 0, dport, 0);
19041904
}
19051905

1906+
/* Send a hand-shake ping */
19061907
void
1907-
rds_send_ping(struct rds_connection *conn, int cp_index)
1908+
rds_send_hs_ping(struct rds_connection *conn, int cp_index)
19081909
{
19091910
unsigned long flags;
19101911
struct rds_conn_path *cp = &conn->c_path[cp_index];
@@ -1920,4 +1921,4 @@ rds_send_ping(struct rds_connection *conn, int cp_index)
19201921
rds_stats_inc(s_send_mprds_ping);
19211922
rds_send_probe(cp, cpu_to_be16(RDS_FLAG_PROBE_PORT), 0, 0);
19221923
}
1923-
EXPORT_SYMBOL_GPL(rds_send_ping);
1924+
EXPORT_SYMBOL_GPL(rds_send_hs_ping);

net/rds/tcp_listen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ int rds_tcp_accept_one(struct socket *sock)
225225
new_sock = NULL;
226226
ret = 0;
227227
if (conn->c_npaths == 0)
228-
rds_send_ping(cp->cp_conn, cp->cp_index);
228+
rds_send_hs_ping(cp->cp_conn, cp->cp_index);
229229
goto out;
230230
rst_nsk:
231231
/* reset the newly returned accept sock and bail.

0 commit comments

Comments
 (0)