[PATCH 2.6.14-git13] ipmi: inconsistent spin_lock in ipmi_smi_msg_received

From: Hironobu Ishii
Date: Fri Nov 11 2005 - 06:53:59 EST


Hi Corey,

You revert a patch by mistake in the following patch > Date Fri, 21 Oct 2005 09:49:09 -0500 > From Corey Minyard <> > Subject [PATCH 1/9] ipmi: use refcount in message handler

(http://lkml.org/lkml/2005/10/21/85)


Signed-off-by: Hironobu Ishii <hishii@xxxxxxxxxxxxxxxx>

diff -urNp linux-2.6.14-git13/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.14-git13.modified/drivers/char/ipmi/ipmi_msghandler.c
--- linux-2.6.14-git13/drivers/char/ipmi/ipmi_msghandler.c 2005-11-11 10:50:37.000000000 +0900
+++ linux-2.6.14-git13.modified/drivers/char/ipmi/ipmi_msghandler.c 2005-11-11 19:53:21.000000000 +0900
@@ -2648,7 +2648,7 @@ void ipmi_smi_msg_received(ipmi_smi_t spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
if (!list_empty(&intf->waiting_msgs)) {
list_add_tail(&msg->link, &intf->waiting_msgs);
- spin_unlock(&intf->waiting_msgs_lock);
+ spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
goto out;
}
spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
@@ -2657,9 +2657,9 @@ void ipmi_smi_msg_received(ipmi_smi_t if (rv > 0) {
/* Could not handle the message now, just add it to a
list to handle later. */
- spin_lock(&intf->waiting_msgs_lock);
+ spin_lock_irqsave(&intf->waiting_msgs_lock, flags);
list_add_tail(&msg->link, &intf->waiting_msgs);
- spin_unlock(&intf->waiting_msgs_lock);
+ spin_unlock_irqrestore(&intf->waiting_msgs_lock, flags);
} else if (rv == 0) {
ipmi_free_smi_msg(msg);
}