Skip to content

Commit 257ea71

Browse files
Hakon-Buggejfvogel
authored andcommitted
rds: Clear reconnect pending bit
When canceling the reconnect worker, care must be taken to reset the reconnect-pending bit. If the reconnect worker has not yet been scheduled before it is canceled, the reconnect-pending bit will stay on forever. Fixes: b85b24a ("rds: Cancel pending connections on connection request") Orabug: 31648138 Suggested-by: Gerd Rausch <[email protected]> Tested-by: Aiman Al-Khammash <[email protected]> Tested-by: Gerald Gibson <[email protected]> Reviewed-by: Sharath Srinivasan <[email protected]> cherry-pick-repo=uek/uek6/master Signed-off-by: Håkon Bugge <[email protected]> (cherry picked from commit b690c3ffb796ae60fe7e3d4bdf99a08a5a333ff8) cherry-pick-repo=uek/uek6/master Signed-off-by: Håkon Bugge <[email protected]>
1 parent 1efe437 commit 257ea71

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/rds/connection.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,7 @@ void rds_conn_shutdown(struct rds_conn_path *cp, int restart)
519519
* to the conn hash, so we never trigger a reconnect on this
520520
* conn - the reconnect is always triggered by the active peer. */
521521
cancel_delayed_work_sync(&cp->cp_conn_w);
522+
rds_clear_reconnect_pending_work_bit(cp);
522523
rcu_read_lock();
523524
if (!hlist_unhashed(&conn->c_hash_node) && restart) {
524525
rcu_read_unlock();

0 commit comments

Comments
 (0)