diff options
| author | Andy Grover <andy.grover@oracle.com> | 2010-03-29 16:50:54 -0700 |
|---|---|---|
| committer | Andy Grover <andy.grover@oracle.com> | 2010-09-08 18:12:18 -0700 |
| commit | cf4b7389ee812817deeb11da1422004e01b50646 (patch) | |
| tree | 318d1e1da095880a19fc41992a3b57e9190e3b23 | |
| parent | f2ec76f288118fb18449402d75383212cbcb6762 (diff) | |
| download | linux-cf4b7389ee812817deeb11da1422004e01b50646.tar.bz2 | |
RDS: Fix locking in send on m_rs_lock
Do not nest m_rs_lock under c_lock
Disable interrupts in {rdma,atomic}_send_complete
Signed-off-by: Andy Grover <andy.grover@oracle.com>
| -rw-r--r-- | net/rds/send.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/send.c b/net/rds/send.c index 15b715a85fd5..ecda3e6c432c 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -468,8 +468,9 @@ void rds_atomic_send_complete(struct rds_message *rm, int status) struct rds_sock *rs = NULL; struct rm_atomic_op *ao; struct rds_notifier *notifier; + unsigned long flags; - spin_lock(&rm->m_rs_lock); + spin_lock_irqsave(&rm->m_rs_lock, flags); ao = &rm->atomic; if (test_bit(RDS_MSG_ON_SOCK, &rm->m_flags) @@ -486,7 +487,7 @@ void rds_atomic_send_complete(struct rds_message *rm, int status) ao->op_notifier = NULL; } - spin_unlock(&rm->m_rs_lock); + spin_unlock_irqrestore(&rm->m_rs_lock, flags); if (rs) { rds_wake_sk_sleep(rs); |