]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] fix remaining list_for_each_safe_rcu in -mm (take 2)
authorPaul E. McKenney <paulmck@us.ibm.com>
Fri, 6 Jan 2006 08:19:53 +0000 (00:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 16:33:58 +0000 (08:33 -0800)
I missed a use of list_for_each_rcu_safe() in -mm tree.  Here is an updated
patch to fix it.  This time tested on a machine that actually uses IPMI...
(Thanks to Serge Hallyn for spotting this.)

Signed-off-by: "Paul E. McKenney" <paulmck@us.ibm.com>
Cc: Corey Minyard <minyard@acm.org>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/char/ipmi/ipmi_msghandler.c

index 1f56b4cf0f589f6622acbdc70da0e1e5a0d520d3..561430ed94af789d6beb67764660a91222f98c42 100644 (file)
@@ -787,7 +787,6 @@ int ipmi_destroy_user(ipmi_user_t user)
        int              i;
        unsigned long    flags;
        struct cmd_rcvr  *rcvr;
-       struct list_head *entry1, *entry2;
        struct cmd_rcvr  *rcvrs = NULL;
 
        user->valid = 1;
@@ -812,8 +811,7 @@ int ipmi_destroy_user(ipmi_user_t user)
         * synchronize_rcu()) then free everything in that list.
         */
        down(&intf->cmd_rcvrs_lock);
-       list_for_each_safe_rcu(entry1, entry2, &intf->cmd_rcvrs) {
-               rcvr = list_entry(entry1, struct cmd_rcvr, link);
+       list_for_each_entry_rcu(rcvr, &intf->cmd_rcvrs, link) {
                if (rcvr->user == user) {
                        list_del_rcu(&rcvr->link);
                        rcvr->next = rcvrs;