diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-09-18 13:44:14 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-19 11:59:44 -0700 |
| commit | aef3ea33e85035f7c827c1db9155f97f4b7ee725 (patch) | |
| tree | cf87224000ffb8e37814e44cb0c166c36f8c49e0 /net/rds | |
| parent | f4fa7f3807d41b78056c6648b04bfadd737df21e (diff) | |
| download | linux-aef3ea33e85035f7c827c1db9155f97f4b7ee725.tar.bz2 | |
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.c | 4 | ||||
| -rw-r--r-- | net/rds/iw_rdma.c | 4 |
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 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; 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 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; |