From 154a1b76a02942845e1cc829c39b28fdc469ea31 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 2 Nov 2010 01:54:01 +0000 Subject: [PATCH] --- yaml --- r: 221628 b: refs/heads/master c: 8200a59f24aeca379660f80658a8c0c343ca5c31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rds/tcp.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2230f0256c25..38f0992a112f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58c490babd4b425310363cbd1f406d7e508f77a5 +refs/heads/master: 8200a59f24aeca379660f80658a8c0c343ca5c31 diff --git a/trunk/net/rds/tcp.c b/trunk/net/rds/tcp.c index 08a8c6cf2d10..8e0a32001c90 100644 --- a/trunk/net/rds/tcp.c +++ b/trunk/net/rds/tcp.c @@ -221,7 +221,13 @@ static int rds_tcp_conn_alloc(struct rds_connection *conn, gfp_t gfp) static void rds_tcp_conn_free(void *arg) { struct rds_tcp_connection *tc = arg; + unsigned long flags; rdsdebug("freeing tc %p\n", tc); + + spin_lock_irqsave(&rds_tcp_conn_lock, flags); + list_del(&tc->t_tcp_node); + spin_unlock_irqrestore(&rds_tcp_conn_lock, flags); + kmem_cache_free(rds_tcp_conn_slab, tc); }