Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aef3ea33 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4fa7f38

net/rds/ib_rdma.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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));

	BUG_ON(list_empty(&ic->ib_node));

	list_del(&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);

	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);

	spin_unlock_irq(&ib_nodev_conns_lock);





	ic->rds_ibdev = rds_ibdev;

	ic->rds_ibdev = rds_ibdev;

net/rds/iw_rdma.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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));

	BUG_ON(list_empty(&ic->iw_node));

	list_del(&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);

	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);

	spin_unlock_irq(&iw_nodev_conns_lock);





	ic->rds_iwdev = rds_iwdev;

	ic->rds_iwdev = rds_iwdev;