Skip to content

Commit aef3ea3

Browse files
error27davem330
authored andcommitted
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>
1 parent f4fa7f3 commit aef3ea3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

net/rds/ib_rdma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *con
171171
BUG_ON(list_empty(&ic->ib_node));
172172
list_del(&ic->ib_node);
173173

174-
spin_lock_irq(&rds_ibdev->spinlock);
174+
spin_lock(&rds_ibdev->spinlock);
175175
list_add_tail(&ic->ib_node, &rds_ibdev->conn_list);
176-
spin_unlock_irq(&rds_ibdev->spinlock);
176+
spin_unlock(&rds_ibdev->spinlock);
177177
spin_unlock_irq(&ib_nodev_conns_lock);
178178

179179
ic->rds_ibdev = rds_ibdev;

net/rds/iw_rdma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ void rds_iw_add_conn(struct rds_iw_device *rds_iwdev, struct rds_connection *con
206206
BUG_ON(list_empty(&ic->iw_node));
207207
list_del(&ic->iw_node);
208208

209-
spin_lock_irq(&rds_iwdev->spinlock);
209+
spin_lock(&rds_iwdev->spinlock);
210210
list_add_tail(&ic->iw_node, &rds_iwdev->conn_list);
211-
spin_unlock_irq(&rds_iwdev->spinlock);
211+
spin_unlock(&rds_iwdev->spinlock);
212212
spin_unlock_irq(&iw_nodev_conns_lock);
213213

214214
ic->rds_iwdev = rds_iwdev;

0 commit comments

Comments
 (0)