aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Brown <zach.brown@oracle.com>2010-07-23 10:37:33 -0700
committerAndy Grover <andy.grover@oracle.com>2010-09-08 18:16:49 -0700
commit4518071ac1bcb76c64a55a3fddb39fb3d39add41 (patch)
treeb64a3c4e61fd41f1f7ef92d9e7d7c5ed27d3ba2c
parentRDS: don't call rds_conn_shutdown() from rds_conn_destroy() (diff)
downloadlinux-dev-4518071ac1bcb76c64a55a3fddb39fb3d39add41.tar.xz
linux-dev-4518071ac1bcb76c64a55a3fddb39fb3d39add41.zip
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>
-rw-r--r--net/rds/connection.c4
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)
rds_conn_drop(conn);
flush_work(&conn->c_down_w);
+ /* make sure lingering queued work won't try to ref the conn */
+ cancel_delayed_work_sync(&conn->c_send_w);
+ cancel_delayed_work_sync(&conn->c_recv_w);
+
/* tear down queued messages */
list_for_each_entry_safe(rm, rtmp,
&conn->c_send_queue,