Skip to contentSkip to conversation

rds: spin_lock_irq() is not nestable

PATCH In review Dan Carpenter 2 participants 2 messages Sep 18, 2010 – Sep 19, 2010

Subsystems (4)
Networking Network drivers Kernel janitors RDS - reliable datagram sockets
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
Andy Grover acked part of this patch before but it didn't get pushed.

net/rds/ib_rdma.c +2 -2
index 8f6e221..b5a8841 100644
@@ -171,9 +171,9 @@ void rds_ib_add_conn(struct rds_ib_device *rds_ibdev, struct rds_connection *con
 	BUG_ON(list_empty(&ic->ib_node));
 	list_del(&ic->ib_node);
 
-	spin_lock_irq(&rds_ibdev->spinlock);
+	spin_lock(&rds_ibdev->spinlock);
 	list_add_tail(&ic->ib_node, &rds_ibdev->conn_list);
-	spin_unlock_irq(&rds_ibdev->spinlock);
+	spin_unlock(&rds_ibdev->spinlock);
 	spin_unlock_irq(&ib_nodev_conns_lock);
 
 	ic->rds_ibdev = rds_ibdev;
net/rds/iw_rdma.c +2 -2
index 4e152e2..0e7accc 100644
@@ -206,9 +206,9 @@ void rds_iw_add_conn(struct rds_iw_device *rds_iwdev, struct rds_connection *con
 	BUG_ON(list_empty(&ic->iw_node));
 	list_del(&ic->iw_node);
 
-	spin_lock_irq(&rds_iwdev->spinlock);
+	spin_lock(&rds_iwdev->spinlock);
 	list_add_tail(&ic->iw_node, &rds_iwdev->conn_list);
-	spin_unlock_irq(&rds_iwdev->spinlock);
+	spin_unlock(&rds_iwdev->spinlock);
 	spin_unlock_irq(&iw_nodev_conns_lock);
 
 	ic->rds_iwdev = rds_iwdev;
maintainer
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Sun, 19 Sep 2010 01:44:14 +0200

Quoted 5 lines

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 <[email protected]>

Also applied, thanks Dan.