Skip to content

Commit

Permalink
ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Manfred Spraul <[email protected]>
Reviewed-by: Josh Triplett <[email protected]>
  • Loading branch information
Lai Jiangshan authored and paulmck committed Jul 20, 2011
1 parent 449a68c commit 693a8b6
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions ipc/sem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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. */
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 693a8b6

Please sign in to comment.