diff options
author | Zach Brown <zach.brown@oracle.com> | 2010-07-23 13:37:33 -0400 |
---|---|---|
committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 21:16:49 -0400 |
commit | 4518071ac1bcb76c64a55a3fddb39fb3d39add41 (patch) | |
tree | b64a3c4e61fd41f1f7ef92d9e7d7c5ed27d3ba2c /net/rds | |
parent | ffcec0e110c198717eb0f6ac000c1e5397db9451 (diff) |
RDS: cancel connection work structs as we shut down
Nothing was canceling the send and receive work that might have been
queued as a conn was being destroyed.
Signed-off-by: Zach Brown <zach.brown@oracle.com>
Diffstat (limited to 'net/rds')
-rw-r--r-- | net/rds/connection.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c index 519b4fe962b6..870992e08cae 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c | |||
@@ -336,6 +336,10 @@ void rds_conn_destroy(struct rds_connection *conn) | |||
336 | rds_conn_drop(conn); | 336 | rds_conn_drop(conn); |
337 | flush_work(&conn->c_down_w); | 337 | flush_work(&conn->c_down_w); |
338 | 338 | ||
339 | /* make sure lingering queued work won't try to ref the conn */ | ||
340 | cancel_delayed_work_sync(&conn->c_send_w); | ||
341 | cancel_delayed_work_sync(&conn->c_recv_w); | ||
342 | |||
339 | /* tear down queued messages */ | 343 | /* tear down queued messages */ |
340 | list_for_each_entry_safe(rm, rtmp, | 344 | list_for_each_entry_safe(rm, rtmp, |
341 | &conn->c_send_queue, | 345 | &conn->c_send_queue, |