p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

posix-timers: Use spin_lock_irq() in itimer_delete() 

itimer_delete() uses spin_lock_irqsave() to obtain a `flags' variable
which can then be passed to unlock_timer(). It uses already spin_lock
locking for the structure instead of lock_timer() because it has a timer
which can not be removed by others at this point. The cleanup is always
performed with enabled interrupts.

Use spin_lock_irq() / spin_unlock_irq() so the `flags' variable can be
removed.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190621143643.25649-3-bigeasy@linutronix.de
This commit is contained in:
Sebastian Andrzej Siewior 2019-06-21 16:36:43 +02:00 committed by Thomas Gleixner
parent 12063d4310
commit 7586addb99
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/time/posix-timers.c
View File

@ -980,18 +980,16 @@ SYSCALL_DEFINE1(timer_delete, timer_t, timer_id)
*/ */
static void itimer_delete(struct k_itimer *timer) static void itimer_delete(struct k_itimer *timer)
{ {
unsigned long flags;
retry_delete: retry_delete:
spin_lock_irqsave(&timer->it_lock, flags); spin_lock_irq(&timer->it_lock);
if (timer_delete_hook(timer) == TIMER_RETRY) { if (timer_delete_hook(timer) == TIMER_RETRY) {
unlock_timer(timer, flags); spin_unlock_irq(&timer->it_lock);
goto retry_delete; goto retry_delete;
} }
list_del(&timer->list); list_del(&timer->list);
unlock_timer(timer, flags); spin_unlock_irq(&timer->it_lock);
release_posix_timer(timer, IT_ID_SET); release_posix_timer(timer, IT_ID_SET);
} }