]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
authorLai Jiangshan <laijs@cn.fujitsu.com>
Fri, 18 Mar 2011 04:09:35 +0000 (12:09 +0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 1 Aug 2011 08:36:55 +0000 (01:36 -0700)
The rcu callback free_un() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(free_un).

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
ipc/sem.c

index 34193ed69fbe03bcd6d5514f557e5eed5865b96f..8b929e6a6eda22e96da29cb72423cdb06cef0685 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -689,12 +689,6 @@ static int count_semzcnt (struct sem_array * sma, ushort semnum)
        return semzcnt;
 }
 
-static void free_un(struct rcu_head *head)
-{
-       struct sem_undo *un = container_of(head, struct sem_undo, rcu);
-       kfree(un);
-}
-
 /* Free a semaphore set. freeary() is called with sem_ids.rw_mutex locked
  * as a writer and the spinlock for this semaphore set hold. sem_ids.rw_mutex
  * remains locked on exit.
@@ -714,7 +708,7 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
                un->semid = -1;
                list_del_rcu(&un->list_proc);
                spin_unlock(&un->ulp->lock);
-               call_rcu(&un->rcu, free_un);
+               kfree_rcu(un, rcu);
        }
 
        /* Wake up all pending processes and let them fail with EIDRM. */
@@ -1612,7 +1606,7 @@ void exit_sem(struct task_struct *tsk)
                sem_unlock(sma);
                wake_up_sem_queue_do(&tasks);
 
-               call_rcu(&un->rcu, free_un);
+               kfree_rcu(un, rcu);
        }
        kfree(ulp);
 }