From 63d026b82505a5c8d41a969c2ff95c6507d54df8 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Fri, 30 Oct 2009 08:51:55 +0000 Subject: [PATCH] --- yaml --- r: 171101 b: refs/heads/master c: 433d308dd85e506bb6529177cc0f997627d87ed6 h: refs/heads/master i: 171099: 2db0d9acab77d6c6d7befb45dee70b85d14c50f4 v: v3 --- [refs] | 2 +- trunk/net/rds/ib_rdma.c | 5 +---- trunk/net/rds/iw_rdma.c | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 50f3689b287b..c324e2ba0ae0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86357b19bcabd9355937f3fb84f90ba9fe76a5d3 +refs/heads/master: 433d308dd85e506bb6529177cc0f997627d87ed6 diff --git a/trunk/net/rds/ib_rdma.c b/trunk/net/rds/ib_rdma.c index ef3ab5b7283e..c5e916598c14 100644 --- a/trunk/net/rds/ib_rdma.c +++ b/trunk/net/rds/ib_rdma.c @@ -187,11 +187,8 @@ void __rds_ib_destroy_conns(struct list_head *list, spinlock_t *list_lock) INIT_LIST_HEAD(list); spin_unlock_irq(list_lock); - list_for_each_entry_safe(ic, _ic, &tmp_list, ib_node) { - if (ic->conn->c_passive) - rds_conn_destroy(ic->conn->c_passive); + list_for_each_entry_safe(ic, _ic, &tmp_list, ib_node) rds_conn_destroy(ic->conn); - } } struct rds_ib_mr_pool *rds_ib_create_mr_pool(struct rds_ib_device *rds_ibdev) diff --git a/trunk/net/rds/iw_rdma.c b/trunk/net/rds/iw_rdma.c index de4a1b16bf7b..b25d785e49fc 100644 --- a/trunk/net/rds/iw_rdma.c +++ b/trunk/net/rds/iw_rdma.c @@ -245,11 +245,8 @@ void __rds_iw_destroy_conns(struct list_head *list, spinlock_t *list_lock) INIT_LIST_HEAD(list); spin_unlock_irq(list_lock); - list_for_each_entry_safe(ic, _ic, &tmp_list, iw_node) { - if (ic->conn->c_passive) - rds_conn_destroy(ic->conn->c_passive); + list_for_each_entry_safe(ic, _ic, &tmp_list, iw_node) rds_conn_destroy(ic->conn); - } } static void rds_iw_set_scatterlist(struct rds_iw_scatterlist *sg,