posix-timers: annotate lock_timer()
PATCH 1/1 posix-timers: annotate lock_timer()
lock_timer() conditionally grabs it_lock in case of returning non-NULL but unlock_timer() releases it unconditionally. This leads sparse to complain about the lock context imbalance. Rename and wrap lock_timer using __cond_lock() macro to make sparse happy.
Signed-off-by Namhyung Kim <[email protected]>
--- kernel/posix-timers.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
kernel/posix-timers.c +8 -2
@@ -145,7 +145,13 @@ static int common_timer_del(struct k_itimer *timer);static enum hrtimer_restart posix_timer_fn (struct hrtimer *data); -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); + +#define lock_timer (tid, flags) \ +({ struct k_itimer *__timr; \ + __cond_lock(&__timr->it_lock, __timr = __lock_timer(tid, flags)); \ + __timr; \ +})static inline void unlock_timer (struct k_itimer *timr,unsigned long flags) {
@@ -619,7 +625,7 @@ out:* the find to the timer lock. To avoid a dead lock, the timer id MUST * 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;/*
Signature · 1 line
1.7.2.2