1 files changed, 13 insertions, 16 deletions

diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c
index 9344a8416ceb..226bc910e556 100644
--- a/net/rxrpc/conn_client.c
+++ b/net/rxrpc/conn_client.c
@@ -721,7 +721,6 @@ void rxrpc_disconnect_client_call(struct rxrpc_call *call)
         }
 
         ASSERTCMP(rcu_access_pointer(chan->call), ==, call);
-        ASSERTCMP(atomic_read(&conn->usage), >=, 2);
 
         /* If a client call was exposed to the world, we save the result for
          * retransmission.
@@ -818,7 +817,7 @@ idle_connection:
 static struct rxrpc_connection *
 rxrpc_put_one_client_conn(struct rxrpc_connection *conn)
 {
-        struct rxrpc_connection *next;
+        struct rxrpc_connection *next = NULL;
         struct rxrpc_local *local = conn->params.local;
         unsigned int nr_conns;
 
@@ -834,24 +833,22 @@ rxrpc_put_one_client_conn(struct rxrpc_connection *conn)
 
         ASSERTCMP(conn->cache_state, ==, RXRPC_CONN_CLIENT_INACTIVE);
 
-        if (!test_bit(RXRPC_CONN_COUNTED, &conn->flags))
-                return NULL;
-
-        spin_lock(&rxrpc_client_conn_cache_lock);
-        nr_conns = --rxrpc_nr_client_conns;
+        if (test_bit(RXRPC_CONN_COUNTED, &conn->flags)) {
+                spin_lock(&rxrpc_client_conn_cache_lock);
+                nr_conns = --rxrpc_nr_client_conns;
+
+                if (nr_conns < rxrpc_max_client_connections &&
+                    !list_empty(&rxrpc_waiting_client_conns)) {
+                        next = list_entry(rxrpc_waiting_client_conns.next,
+                                          struct rxrpc_connection, cache_link);
+                        rxrpc_get_connection(next);
+                        rxrpc_activate_conn(next);
+                }
 
-        next = NULL;
-        if (nr_conns < rxrpc_max_client_connections &&
-            !list_empty(&rxrpc_waiting_client_conns)) {
-                next = list_entry(rxrpc_waiting_client_conns.next,
-                                  struct rxrpc_connection, cache_link);
-                rxrpc_get_connection(next);
-                rxrpc_activate_conn(next);
+                spin_unlock(&rxrpc_client_conn_cache_lock);
         }
 
-        spin_unlock(&rxrpc_client_conn_cache_lock);
         rxrpc_kill_connection(conn);
-
         if (next)
                 rxrpc_activate_channels(next);