From f6c1f8219c9e59b4a0f0f8b77b6f9eba4e9e9719 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 23 Jul 2010 10:30:45 -0700 Subject: [PATCH] --- yaml --- r: 214465 b: refs/heads/master c: fe8ff6b58f040dd52d2db45972db8e0301847f1c h: refs/heads/master i: 214463: fc850d6e81fe0390a68295b989e1d8dc020bcd42 v: v3 --- [refs] | 2 +- trunk/net/rds/connection.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bad0520c2ed5..4f143b2e8bf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea819867b788728aca60717e4fdacb3df771f670 +refs/heads/master: fe8ff6b58f040dd52d2db45972db8e0301847f1c diff --git a/trunk/net/rds/connection.c b/trunk/net/rds/connection.c index 0de40d9563ca..75a1a37d64d3 100644 --- a/trunk/net/rds/connection.c +++ b/trunk/net/rds/connection.c @@ -313,6 +313,7 @@ void rds_conn_shutdown(struct rds_connection *conn) void rds_conn_destroy(struct rds_connection *conn) { struct rds_message *rm, *rtmp; + unsigned long flags; rdsdebug("freeing conn %p for %pI4 -> " "%pI4\n", conn, &conn->c_laddr, @@ -350,7 +351,9 @@ void rds_conn_destroy(struct rds_connection *conn) BUG_ON(!list_empty(&conn->c_retrans)); kmem_cache_free(rds_conn_slab, conn); + spin_lock_irqsave(&rds_conn_lock, flags); rds_conn_count--; + spin_unlock_irqrestore(&rds_conn_lock, flags); } EXPORT_SYMBOL_GPL(rds_conn_destroy);