From 40a8697a8f1db36b8ce409caefb185f6befa5d67 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 23 Jul 2010 10:37:33 -0700 Subject: [PATCH] --- yaml --- r: 214469 b: refs/heads/master c: 4518071ac1bcb76c64a55a3fddb39fb3d39add41 h: refs/heads/master i: 214467: 4ef6c39a72b06fdab35286e7960d7f0b31d23161 v: v3 --- [refs] | 2 +- trunk/net/rds/connection.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3fd637d5dbce..415d9eb2bb56 100644 --- 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 index 519b4fe962b6..870992e08cae 100644 --- 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,