* [patch -next] rds: spin_lock_irq() is not nestable
@ 2010-09-18 23:44 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-09-18 23:44 UTC (permalink / raw)
To: Andy Grover
Cc: David S. Miller, Zach Brown, Chris Mason, rds-devel, netdev,
kernel-janitors
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>
---
Andy Grover acked part of this patch before but it didn't get pushed.
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 8f6e221..b5a8841 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 4e152e2..0e7accc 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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [patch -next] rds: spin_lock_irq() is not nestable
@ 2010-09-18 23:44 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-09-18 23:44 UTC (permalink / raw)
To: Andy Grover
Cc: David S. Miller, Zach Brown, Chris Mason, rds-devel, netdev,
kernel-janitors
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>
---
Andy Grover acked part of this patch before but it didn't get pushed.
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
index 8f6e221..b5a8841 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 4e152e2..0e7accc 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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch -next] rds: spin_lock_irq() is not nestable
2010-09-18 23:44 ` Dan Carpenter
@ 2010-09-19 19:00 ` David Miller
-1 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2010-09-19 18:59 UTC (permalink / raw)
To: error27
Cc: andy.grover, zach.brown, chris.mason, rds-devel, netdev,
kernel-janitors
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 19 Sep 2010 01:44:14 +0200
> 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>
Also applied, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch -next] rds: spin_lock_irq() is not nestable
@ 2010-09-19 19:00 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2010-09-19 19:00 UTC (permalink / raw)
To: error27
Cc: andy.grover, zach.brown, chris.mason, rds-devel, netdev,
kernel-janitors
From: Dan Carpenter <error27@gmail.com>
Date: Sun, 19 Sep 2010 01:44:14 +0200
> 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>
Also applied, thanks Dan.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-19 18:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-18 23:44 [patch -next] rds: spin_lock_irq() is not nestable Dan Carpenter
2010-09-18 23:44 ` Dan Carpenter
2010-09-19 18:59 ` David Miller
2010-09-19 19:00 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.