diff options
| author | Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2017-01-24 13:00:48 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-24 16:14:58 -0500 |
| commit | 35e22e49a5d6a741ebe7f2dd280b2052c3003ef7 (patch) | |
| tree | bfc74562fb8162e028d1ddf141ba908d620e53d4 /net/tipc | |
| parent | 4c887aa65d38633885010277f3482400681be719 (diff) | |
| download | op-kernel-dev-35e22e49a5d6a741ebe7f2dd280b2052c3003ef7.zip op-kernel-dev-35e22e49a5d6a741ebe7f2dd280b2052c3003ef7.tar.gz | |
tipc: fix cleanup at module unload
In tipc_server_stop(), we iterate over the connections with limiting
factor as server's idr_in_use. We ignore the fact that this variable
is decremented in tipc_close_conn(), leading to premature exit.
In this commit, we iterate until the we have no connections left.
Acked-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: John Thompson <thompa.atl@gmail.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/server.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tipc/server.c b/net/tipc/server.c index 04ff441..3cd6402 100644 --- a/net/tipc/server.c +++ b/net/tipc/server.c @@ -619,14 +619,12 @@ int tipc_server_start(struct tipc_server *s) void tipc_server_stop(struct tipc_server *s) { struct tipc_conn *con; - int total = 0; int id; spin_lock_bh(&s->idr_lock); - for (id = 0; total < s->idr_in_use; id++) { + for (id = 0; s->idr_in_use; id++) { con = idr_find(&s->conn_idr, id); if (con) { - total++; spin_unlock_bh(&s->idr_lock); tipc_close_conn(con); spin_lock_bh(&s->idr_lock); |
