---

yaml --- r: 214431 b: refs/heads/master c: abf4543 h: refs/heads/master i: 214429: 1e73dc8 214427: ed9ffa8 214423: 6aa1ee9 214415: 7eb3a84 214399: 417877e v: v3
git-mirror · Sep 9, 2010 · 2152ab8 · 2152ab8
1 parent a5d13eb
commit 2152ab8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9e65383a20d9a656db70efbf67e57f8115ad776
+refs/heads/master: abf454398c2ebafc629ebb8b149f5a752c79e919
diff --git a/trunk/net/rds/connection.c b/trunk/net/rds/connection.c
@@ -321,7 +321,10 @@ void rds_conn_destroy(struct rds_connection *conn)
 		 "%pI4\n", conn, &conn->c_laddr,
 		 &conn->c_faddr);
 
+	/* Ensure conn will not be scheduled for reconnect */
+	spin_lock_irq(&rds_conn_lock);
 	hlist_del_init(&conn->c_hash_node);
+	spin_unlock_irq(&rds_conn_lock);
 
 	/* wait for the rds thread to shut it down */
 	atomic_set(&conn->c_state, RDS_CONN_ERROR);