diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
| commit | f16180739cd18a39a1a45516ac0e65d18a9f100e (patch) | |
| tree | 22d1135650f8ddb25707c788cd4846c77b428ff0 /net/rxrpc/local_object.c | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| parent | e1e54ec7fb55501c33b117c111cb0a045b8eded2 (diff) | |
| download | kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.gz kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.bz2 kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.zip | |
Merge remote-tracking branch 'net/master' into afs-next
Diffstat (limited to 'net/rxrpc/local_object.c')
| -rw-r--r-- | net/rxrpc/local_object.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index 72a6e12a9304..36587260cabd 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c @@ -426,11 +426,14 @@ static void rxrpc_local_destroyer(struct rxrpc_local *local) _enter("%d", local->debug_id); + local->dead = true; + mutex_lock(&rxnet->local_mutex); list_del_init(&local->link); mutex_unlock(&rxnet->local_mutex); - ASSERT(RB_EMPTY_ROOT(&local->client_conns)); + rxrpc_clean_up_local_conns(local); + rxrpc_service_connection_reaper(&rxnet->service_conn_reaper); ASSERT(!local->service); if (socket) { |