From 34682815d3887297821830899674ee2ac03a0ad1 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Wed, 1 Apr 2009 08:20:18 +0000 Subject: [PATCH] --- yaml --- r: 139791 b: refs/heads/master c: f1cffcbfcc53b825da7d1d26244aabd8dccb24aa h: refs/heads/master i: 139789: 5e8095a3b62e2a236126ad93feccb623d99e0532 139787: cf24aafccb761372fd17b5c9308af27cc4f118ff 139783: 3fc09306bc2c2d22224b3b5fef863542c700ec16 139775: 358f40954a177056b274ebff230831d79f0fd2c5 v: v3 --- [refs] | 2 +- trunk/net/rds/send.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4cd7e1c2c6dd..d898219743c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1782852adb57c8daf76a56146424f6c2f7410b6 +refs/heads/master: f1cffcbfcc53b825da7d1d26244aabd8dccb24aa diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c index 1b37364656f0..104fe033203d 100644 --- a/trunk/net/rds/send.c +++ b/trunk/net/rds/send.c @@ -615,7 +615,7 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest) { struct rds_message *rm, *tmp; struct rds_connection *conn; - unsigned long flags; + unsigned long flags, flags2; LIST_HEAD(list); int wake = 0; @@ -651,9 +651,9 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest) list_for_each_entry(rm, &list, m_sock_item) { /* We do this here rather than in the loop above, so that * we don't have to nest m_rs_lock under rs->rs_lock */ - spin_lock(&rm->m_rs_lock); + spin_lock_irqsave(&rm->m_rs_lock, flags2); rm->m_rs = NULL; - spin_unlock(&rm->m_rs_lock); + spin_unlock_irqrestore(&rm->m_rs_lock, flags2); /* * If we see this flag cleared then we're *sure* that someone