aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-09-18 09:44:14 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-19 14:59:44 -0400
commitaef3ea33e85035f7c827c1db9155f97f4b7ee725 (patch)
treecf87224000ffb8e37814e44cb0c166c36f8c49e0 /net/rds
parentf4fa7f3807d41b78056c6648b04bfadd737df21e (diff)
rds: spin_lock_irq() is not nestable
This is basically just a cleanup. IRQs were disabled on the previous line so we don't need to do it again here. In the current code IRQs would get turned on one line earlier than intended. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
-rw-r--r--net/rds/ib_rdma.c4
-rw-r--r--net/rds/iw_rdma.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 8f6e221c9f78..b5a88415a18e 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -171,9 +171,9 @@ void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *con
171 BUG_ON(list_empty(&ic->ib_node)); 171 BUG_ON(list_empty(&ic->ib_node));
172 list_del(&ic->ib_node); 172 list_del(&ic->ib_node);
173 173
174 spin_lock_irq(&rds_ibdev->spinlock); 174 spin_lock(&rds_ibdev->spinlock);
175 list_add_tail(&ic->ib_node, &rds_ibdev->conn_list); 175 list_add_tail(&ic->ib_node, &rds_ibdev->conn_list);
176 spin_unlock_irq(&rds_ibdev->spinlock); 176 spin_unlock(&rds_ibdev->spinlock);
177 spin_unlock_irq(&ib_nodev_conns_lock); 177 spin_unlock_irq(&ib_nodev_conns_lock);
178 178
179 ic->rds_ibdev = rds_ibdev; 179 ic->rds_ibdev = rds_ibdev;
diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
index 4e152e2daa3d..0e7accc23ee2 100644
--- a/net/rds/iw_rdma.c
+++ b/net/rds/iw_rdma.c
@@ -206,9 +206,9 @@ void rds_iw_add_conn(struct rds_iw_device *rds_iwdev, struct rds_connection *con
206 BUG_ON(list_empty(&ic->iw_node)); 206 BUG_ON(list_empty(&ic->iw_node));
207 list_del(&ic->iw_node); 207 list_del(&ic->iw_node);
208 208
209 spin_lock_irq(&rds_iwdev->spinlock); 209 spin_lock(&rds_iwdev->spinlock);
210 list_add_tail(&ic->iw_node, &rds_iwdev->conn_list); 210 list_add_tail(&ic->iw_node, &rds_iwdev->conn_list);
211 spin_unlock_irq(&rds_iwdev->spinlock); 211 spin_unlock(&rds_iwdev->spinlock);
212 spin_unlock_irq(&iw_nodev_conns_lock); 212 spin_unlock_irq(&iw_nodev_conns_lock);
213 213
214 ic->rds_iwdev = rds_iwdev; 214 ic->rds_iwdev = rds_iwdev;