redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

posix-timers: lock_timer: make it readable

Browse source 
Cleanup.  Imho makes the code much more understandable.  At least this
patch lessens both the source and compiled code.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: mingo@elte.hu
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Oleg Nesterov 2008-09-22 14:42:51 -07:00 committed by Thomas Gleixner
parent 5a51b713cc
commit 31d9284569
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kernel/posix-timers.c
View file

@ -556,7 +556,7 @@ out:
* the find to the timer lock. To avoid a dead lock, the timer id MUST * the find to the timer lock. To avoid a dead lock, the timer id MUST
* be release with out holding the timer lock. * be release with out holding the timer lock.
*/ */
static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags) static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags)
{ {
struct k_itimer *timr; struct k_itimer *timr;
/* /*
@ -564,23 +564,20 @@ static struct k_itimer * lock_timer(timer_t timer_id, unsigned long *flags)
* flags part over to the timer lock. Must not let interrupts in * flags part over to the timer lock. Must not let interrupts in
* while we are moving the lock. * while we are moving the lock.
*/ */
spin_lock_irqsave(&idr_lock, *flags); spin_lock_irqsave(&idr_lock, *flags);
timr = idr_find(&posix_timers_id, (int) timer_id); timr = idr_find(&posix_timers_id, (int)timer_id);
if (timr) { if (timr) {
spin_lock(&timr->it_lock); spin_lock(&timr->it_lock);
if (timr->it_process &&
if (!timr->it_process || same_thread_group(timr->it_process, current)) {
!same_thread_group(timr->it_process, current)) {
spin_unlock(&timr->it_lock);
spin_unlock_irqrestore(&idr_lock, *flags);
timr = NULL;
} else
spin_unlock(&idr_lock); spin_unlock(&idr_lock);
} else return timr;
spin_unlock_irqrestore(&idr_lock, *flags); }
spin_unlock(&timr->it_lock);
}
spin_unlock_irqrestore(&idr_lock, *flags);
return timr; return NULL;
} }
/* /*