---

yaml --- r: 214469 b: refs/heads/master c: 4518071 h: refs/heads/master i: 214467: 4ef6c39 v: v3
git-mirror · Sep 9, 2010 · 40a8697 · 40a8697
1 parent daf0293
commit 40a8697
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffcec0e110c198717eb0f6ac000c1e5397db9451
+refs/heads/master: 4518071ac1bcb76c64a55a3fddb39fb3d39add41
diff --git a/trunk/net/rds/connection.c b/trunk/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,